summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@android.com>2012-03-01 22:55:17 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-03-01 22:55:17 -0800
commitf91e52c986f4e7f8094a794c471813ac05d5d59c (patch)
treea7b09912b6337a6bf9f7eeac5ffd7d7d9577434c /res/values
parent9ae0b5a23d8bc010589e77d29926b55903f3a31e (diff)
parentc4bf8cd955e7a317c6d9c0eb023d5994be0f1e9d (diff)
downloadpackages_apps_Settings-f91e52c986f4e7f8094a794c471813ac05d5d59c.zip
packages_apps_Settings-f91e52c986f4e7f8094a794c471813ac05d5d59c.tar.gz
packages_apps_Settings-f91e52c986f4e7f8094a794c471813ac05d5d59c.tar.bz2
am c4bf8cd9: am 2f76aaaf: Merge "Enable EAP-pwd configuration in WiFi Settings."
* commit 'c4bf8cd955e7a317c6d9c0eb023d5994be0f1e9d': Enable EAP-pwd configuration in WiFi Settings.
Diffstat (limited to 'res/values')
-rw-r--r--res/values/arrays.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 97c6d99..80cb2cf 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -307,6 +307,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. -->
@@ -416,6 +418,7 @@
<item>PEAP</item>
<item>TLS</item>
<item>TTLS</item>
+ <item>PWD</item>
</string-array>
<!-- Phase 2 options -->