Merge master@5406228 into qt-dev.

Change-Id: I4a9fbb4c53a2696230fbdc26bb4d303171696eee BUG: 129345239
2019-03-28 16:39:54 +00:00
parent 7900c4cb02 271e79a7cb
commit 7fa670a9f9
2 changed files with 0 additions and 5 deletions
@@ -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))
@@ -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