Merge "Fix NoSuchMethodError for unit tests"

proguard.flags

@@ -20,6 +20,11 @@
   *** apply();
 }
 
+-keepclasseswithmembers class com.android.emailcommon.utility.Utility$CloseTraceCursorWrapper {
+  *** getTraceIfAvailable(android.database.Cursor);
+  *** log(android.database.Cursor);
+}
+
 -keep class * extends org.apache.james.mime4j.util.TempStorage
 
 # Keep names that are used only by unit tests or by animators
@@ -28,6 +33,10 @@
   *** *Anim(...);
 }
 
+-keepclasseswithmembers class com.android.email.activity.setup.AccountSetupAccountType {
+  *** checkAccountInstanceLimit(com.android.email.mail.Store$StoreInfo);
+}
+
 -keepclasseswithmembers class com.android.email.GroupMessagingListener {
   *** removeListener(com.android.email.MessagingListener);
 }
@@ -165,6 +174,12 @@
   *** getShortcutSafeUri();
 }
 
+-keepclasseswithmembers class com.android.exchange.CalendarSyncEnabler {
+  <init>(android.content.Context);
+  *** enableEasCalendarSyncInternal();
+  *** showNotification(java.lang.String);
+}
+
 -keepclasseswithmembers class com.android.exchange.adapter.Parser {
   *** resetInput(java.io.InputStream);
 }