Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
* tag 'android-6.0.0_r26':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Change-Id: Ib227ca238fdf925a29275c14c3642c2171b83f99
diff --git a/Android.mk b/Android.mk
index 97570dc..88db670 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,6 +30,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_PROGUARD_ENABLED := disabled
+
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_JNI_SHARED_LIBRARIES := libjni_tinyplanet libjni_jpegutil