merge in master-release history after reset to master

[android-x86/packages-apps-Settings.git] / proguard.flags

diff --git a/proguard.flags b/proguard.flags
index 8a6c2cb..211a5a4 100644 (file)
--- a/proguard.flags
+++ b/proguard.flags
@@ -13,6 +13,7 @@
 -keep class com.android.settings.fuelgauge.*
 -keep class com.android.settings.users.*
 -keep class com.android.settings.NotificationStation
+-keep class com.android.settings.nfc.*
 
 # Keep click responders
 -keepclassmembers class com.android.settings.inputmethod.UserDictionaryAddWordActivity {