Merge "Make sure CREATOR classes don't get stripped" into jb-ub-mail-ur11
diff --git a/proguard.flags b/proguard.flags
index 7bab921..dd94b99 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -24,6 +24,10 @@
   public <methods>;
 }
 
+# Needed for Parcelable/SafeParcelable Creators to not get stripped
+-keep class * implements android.os.Parcelable {
+    public static final ** CREATOR;
+}
 
 -keepclasseswithmembers class com.google.common.collect.ImmutableMap {
   *** of(...);