Merge master@5406228 into git_qt-dev-plus-aosp.

Change-Id: I67f4b680887fa8fc373113d02cb9a1234b2a7353 BUG: 129345239
2019-03-29 04:26:02 +00:00
parent 7900c4cb02 271e79a7cb
commit d8430343b6
2 changed files with 0 additions and 5 deletions
--- a/Android.mk
+++ b/Android.mk
@@ -70,8 +70,6 @@ LOCAL_CERTIFICATE := platform

 LOCAL_SDK_VERSION := current

-LOCAL_COMPATIBILITY_SUITE := device-tests
-
 include $(BUILD_PACKAGE)

 include $(call all-makefiles-under, $(LOCAL_PATH))
--- a/proguard.flags
+++ b/proguard.flags
@@ -21,9 +21,6 @@
 -keepclassmembers class * {
  @com.google.common.annotations.VisibleForTesting *;
 }
-keepclassmembers class * {
-  @com.android.messaging.ui.contact.ContactPickerFragment *;
-}

 # Keep methods that have the @VisibleForAnimation annotation
 -keep @interface com.android.messaging.annotation.VisibleForAnimation