commit 343059ac102432d9c75354c7a043bb64e284326e
author Divya Sharma <c_shard@codeaurora.org> Wed Nov 04 09:34:47 2015 -0800
committer Divya Sharma <c_shard@codeaurora.org> Wed Nov 04 09:34:47 2015 -0800
tree d677cc606b9701f27fcd230230a103689207a099
parent 7e4851ff7e0ece777432d3579de82bf24a91f08d
parent 096a45a67ca693804beca3aa50a1e9975afbe46d

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

Android.mk

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