Merge branch 'master' into honeycomb-release

This commit is contained in:
The Android Automerger
2010-10-29 07:32:39 -07:00

View File

@@ -4,3 +4,5 @@
-keep class com.android.settings.*Settings -keep class com.android.settings.*Settings
-keep class com.android.settings.wifi.*Settings -keep class com.android.settings.wifi.*Settings
-keep class com.android.settings.deviceinfo.* -keep class com.android.settings.deviceinfo.*
-keep class com.android.settings.bluetooth.*