diff options
| author | Martijn Coenen <maco@google.com> | 2015-07-29 10:06:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 10:06:14 +0000 |
| commit | ef3614ebb9089936ba32772f89c14466d77ba777 (patch) | |
| tree | 2b6a316626d06fb9c9af9e3bbf819c9d69fe97b6 /packages/SettingsProvider/res | |
| parent | 5b0656556a085cbf4e7f17f4dfa8863a022f8e11 (diff) | |
| parent | c16fd06ae462f79d3f13eb5e29db3227c0e64985 (diff) | |
| download | frameworks_base-ef3614ebb9089936ba32772f89c14466d77ba777.zip frameworks_base-ef3614ebb9089936ba32772f89c14466d77ba777.tar.gz frameworks_base-ef3614ebb9089936ba32772f89c14466d77ba777.tar.bz2 | |
am c16fd06a: am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev
* commit 'c16fd06ae462f79d3f13eb5e29db3227c0e64985':
Resource for setting default NFC payment component.
Diffstat (limited to 'packages/SettingsProvider/res')
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 3f0d71c..1cd2908 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -210,4 +210,6 @@ <!-- Default state of tap to wake --> <bool name="def_double_tap_to_wake">true</bool> + <!-- Default for Settings.Secure.NFC_PAYMENT_COMPONENT --> + <string name="def_nfc_payment_component"></string> </resources> |