Merge commit '995ffde579c7a4b1b65e6a1d8a9241c7db580f94' into HEAD

devrel-build · devrel-build · commit 5ad93d9e8bba · 2016-04-18T19:29:06.000Z
diff --git a/samples-android/ButtonClicker/src/main/jni/Application.mk b/samples-android/ButtonClicker/src/main/jni/Application.mk
@@ -1,6 +1,5 @@
 APP_PLATFORM := android-22
-#APP_ABI := armeabi-v7a
-APP_ABI := arm64-v8a
+APP_ABI := armeabi-v7a
 APP_STL := c++_static
 
 APP_CPPFLAGS := -std=c++11
