Revert "Enable Proguard."

This reverts commit c237ae8c85.

Reason: We need more flags for unit tests

Android.mk

@@ -28,9 +28,6 @@ LOCAL_JAVA_STATIC_LIBRARIES := android-common
 
 LOCAL_PACKAGE_NAME := Email
 
-LOCAL_PROGUARD_ENABLED := full
-LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
-
 include $(BUILD_PACKAGE)
 
 # additionally, build unit tests in a separate .apk

proguard.flags

@@ -1,20 +0,0 @@
-# keep names that are used by reflection.
--keep class com.android.email.provider.EmailContent$Account
--keepclasseswithmembers class * {
-  public static void actionEditIncomingSettings(android.app.Activity, com.android.email.provider.EmailContent$Account);
-}
-
--keepclasseswithmembers class * {
-  public static void actionEditOutgoingSettings(android.app.Activity, com.android.email.provider.EmailContent$Account);
-}
-
--keepclasseswithmembers class * {
-  public *** newInstance(android.content.Context, java.lang.String);
-}
-
--keep class com.android.email.mail.Store$PersistentDataCallbacks
--keepclasseswithmembers class * {
-  public *** newInstance(java.lang.String, android.content.Context, com.android.email.mail.Store$PersistentDataCallbacks);
-}
-
--keep class * extends org.apache.james.mime4j.util.TempStorage

tests/Android.mk

@@ -33,6 +33,5 @@ LOCAL_INSTRUMENTATION_FOR := Email
 
 LOCAL_SDK_VERSION := current
 
-LOCAL_PROGUARD_ENABLED := full
-
 include $(BUILD_PACKAGE)
+