diff options
author | Irfan Sheriff <isheriff@android.com> | 2012-03-01 23:57:12 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-01 23:57:12 -0800 |
commit | 6c9c305b28a33a7272ded543650223638ea5836d (patch) | |
tree | ea761e6d122f7860fd2209e768f41a3ae226ee5c /res/values | |
parent | bb826f26cb36261b06e218a0c76e3bc6d518314f (diff) | |
parent | f91e52c986f4e7f8094a794c471813ac05d5d59c (diff) | |
download | packages_apps_Settings-6c9c305b28a33a7272ded543650223638ea5836d.zip packages_apps_Settings-6c9c305b28a33a7272ded543650223638ea5836d.tar.gz packages_apps_Settings-6c9c305b28a33a7272ded543650223638ea5836d.tar.bz2 |
am f91e52c9: am c4bf8cd9: am 2f76aaaf: Merge "Enable EAP-pwd configuration in WiFi Settings."
* commit 'f91e52c986f4e7f8094a794c471813ac05d5d59c':
Enable EAP-pwd configuration in WiFi Settings.
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/arrays.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 8c7ebfc..e89c00c 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -315,6 +315,8 @@ <item>TLS</item> <!-- Do not translate. --> <item>TTLS</item> + <!-- Do not translate. --> + <item>PWD</item> </string-array> <!-- Wi-Fi WPS setup for p2p connections. --> @@ -424,6 +426,7 @@ <item>PEAP</item> <item>TLS</item> <item>TTLS</item> + <item>PWD</item> </string-array> <!-- Phase 2 options --> |