commit 55326bf8551c20cedafdca124bf0c9aa4a36f7bc
author The Android Automerger <android-build@google.com> Tue Mar 22 15:47:41 2016 -0700
committer The Android Automerger <android-build@google.com> Tue Mar 22 15:47:41 2016 -0700
tree b8e07d9d48fe058d67f08bf2a62a33d3b44fbade
parent b49207a13133c86db99cd06fc8428d218604e608
parent 68ea405036d78809bfee253b02908336b3a4548b

merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev

include/core/SkPostConfig.h

diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h
index 37e6c59..386baa1 100644
--- a/include/core/SkPostConfig.h
+++ b/include/core/SkPostConfig.h
@@ -114,7 +114,7 @@
 #    define SK_CRASH() __debugbreak()
 #  else
 #    if 1   // set to 0 for infinite loop, which can help connecting gdb
-#      define SK_CRASH() do { SkNO_RETURN_HINT(); *(int *)(uintptr_t)0xbbadbeef = 0; } while (false)
+#      define SK_CRASH() do { SkNO_RETURN_HINT(); abort(); } while (false)
 #    else
 #      define SK_CRASH() do { SkNO_RETURN_HINT(); } while (true)
 #    endif