summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Westbrook <pwestbro@android.com>2014-01-14 08:43:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-14 08:43:40 +0000
commit0a77e43d7bb739c660c75c13c6935b2afe6216f9 (patch)
tree9ef722717215b2037f25cb696a1b8c3ef1b6f05d
parent745c9646d684b035ec5bd455ac20c44e1c1e8897 (diff)
parent62516190df7d8c35a73bd1e49da9e22c94cf23e8 (diff)
downloadandroid_packages_apps_Calendar-0a77e43d7bb739c660c75c13c6935b2afe6216f9.tar.gz
android_packages_apps_Calendar-0a77e43d7bb739c660c75c13c6935b2afe6216f9.tar.bz2
android_packages_apps_Calendar-0a77e43d7bb739c660c75c13c6935b2afe6216f9.zip
am 62516190: am 1f9aed5f: am 3a229e6f: Merge "Fix a crash when General Settings is opened"
* commit '62516190df7d8c35a73bd1e49da9e22c94cf23e8': Fix a crash when General Settings is opened
-rw-r--r--proguard.flags1
1 files changed, 1 insertions, 0 deletions
diff --git a/proguard.flags b/proguard.flags
index 76eb5280..bd7f0d54 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -1,6 +1,7 @@
-keep class com.android.calendar.selectcalendars.SelectCalendarsSyncFragment
-keep class com.android.calendar.OtherPreferences
-keep class com.android.calendar.AboutPreferences
+-keep class com.android.calendar.GeneralPreferences
-keepclassmembers class com.android.calendar.AllInOneActivity {
*** setControlsOffset(...);
}