-diff -u -r ../fish-shell-c76d86631717929b3a2f259615e8603e69e13256/src/common.cpp ./src/common.cpp
---- ../fish-shell-c76d86631717929b3a2f259615e8603e69e13256/src/common.cpp 2016-05-03 01:20:53.000000000 -0400
-+++ ./src/common.cpp 2016-05-03 07:16:32.052328928 -0400
-@@ -68,6 +68,7 @@
- void show_stackframe() {
- ASSERT_IS_NOT_FORKED_CHILD();
-
-+#ifndef __ANDROID__
- // Hack to avoid showing backtraces in the tester.
- if (program_name && !wcscmp(program_name, L"(ignore)")) return;
-
-@@ -77,6 +78,7 @@
- trace_size = backtrace(trace, 32);
- debug(0, L"Backtrace:");
- backtrace_symbols_fd(trace, trace_size, STDERR_FILENO);
-+#endif
- }
-
- int fgetws2(wcstring *s, FILE *f) {