Merge "Updates to match prebuilts drop" into pi-dev am: b299122e08

am: 8e51db884e Change-Id: I790d275e30bccd446a00615149a90440d172e163
2018-04-04 16:45:09 -07:00
parent 6027d42a5a 8e51db884e
commit 8a485f0ada
5 changed files with 15 additions and 8 deletions
--- a/proguard.flags
+++ b/proguard.flags
@@ -55,3 +55,4 @@
    public static ** SEARCH_INDEX_DATA_PROVIDER;
    public static ** SUMMARY_PROVIDER_FACTORY;
 }
+-keep class android.support.v4.app.CoreComponentFactory