diff options
| author | Jeff Hamilton <jham@android.com> | 2010-10-25 14:49:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-25 14:49:07 -0700 |
| commit | fecc5f066d7aa84ce3474912f1137a10bd77bb8e (patch) | |
| tree | 0923b3f5cd996c05eff4152ec16a4cf187934d49 /core | |
| parent | 6c8d8d8927373fdb9ad1c853396b5dbc8295f996 (diff) | |
| parent | 106165b5102be226eb8049d2f7f62d7e26034e8a (diff) | |
| download | frameworks_base-fecc5f066d7aa84ce3474912f1137a10bd77bb8e.zip frameworks_base-fecc5f066d7aa84ce3474912f1137a10bd77bb8e.tar.gz frameworks_base-fecc5f066d7aa84ce3474912f1137a10bd77bb8e.tar.bz2 | |
am 106165b5: Merge "Add a RHS status bar slot for NFC." into gingerbread
Merge commit '106165b5102be226eb8049d2f7f62d7e26034e8a' into gingerbread-plus-aosp
* commit '106165b5102be226eb8049d2f7f62d7e26034e8a':
Add a RHS status bar slot for NFC.
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values/config.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index f3f7892..72c3be2 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -32,6 +32,7 @@ <item><xliff:g id="id">sync_active</xliff:g></item> <item><xliff:g id="id">gps</xliff:g></item> <item><xliff:g id="id">bluetooth</xliff:g></item> + <item><xliff:g id="id">nfc</xliff:g></item> <item><xliff:g id="id">tty</xliff:g></item> <item><xliff:g id="id">speakerphone</xliff:g></item> <item><xliff:g id="id">mute</xliff:g></item> |