aboutsummaryrefslogtreecommitdiffstats
path: root/files
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-11-15 16:43:16 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2010-11-15 16:43:16 -0800
commit8861ea6b05d7e1d4ab09229771f5e1d1e768f697 (patch)
treed1ec4f145b10bc706ed2f5e39bf4239fefd6de03 /files
parent25e44c531fefe31521e7deb6773f080b34c9ec8a (diff)
parent37e667cecfc62a5228b888a822f79df2d3eb2704 (diff)
downloadsdk-8861ea6b05d7e1d4ab09229771f5e1d1e768f697.zip
sdk-8861ea6b05d7e1d4ab09229771f5e1d1e768f697.tar.gz
sdk-8861ea6b05d7e1d4ab09229771f5e1d1e768f697.tar.bz2
merge from open-source master
Change-Id: I717ec549d6917bc238a3517c091cfcca0609ef8c
Diffstat (limited to 'files')
-rw-r--r--files/proguard.cfg1
1 files changed, 1 insertions, 0 deletions
diff --git a/files/proguard.cfg b/files/proguard.cfg
index a88f3b7..12dd039 100644
--- a/files/proguard.cfg
+++ b/files/proguard.cfg
@@ -11,6 +11,7 @@
-keep public class * extends android.content.BroadcastReceiver
-keep public class * extends android.content.ContentProvider
-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
-keep public class com.android.vending.licensing.ILicensingService
-keepclasseswithmembernames class * {