am b1ea6805: Merge "Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot"

# By Venkataraman Nerellapalli
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit 'b1ea6805d98bf953448db350ae33e53c3c3b797d':
  Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot
This commit is contained in:
Irfan Sheriff
2013-01-24 11:30:12 -08:00
committed by Android Git Automerger

View File

@@ -298,12 +298,10 @@
<!-- Wi-Fi AP settings. The type of security a Wi-Fi AP supports. --> <!-- Wi-Fi AP settings. The type of security a Wi-Fi AP supports. -->
<!-- Note that adding/removing/moving the items will need wifi settings code change. --> <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
<string-array name="wifi_ap_security" translatable="false"> <string-array name="wifi_ap_security">
<item>Open</item> <item>@string/wifi_security_none</item>
<!-- Do not translate. --> <item>@string/wifi_security_wpa</item>
<item>WPA PSK</item> <item>@string/wifi_security_wpa2</item>
<!-- Do not translate. -->
<item>WPA2 PSK</item>
</string-array> </string-array>
<!-- Match this with the constants in WifiDialog. --> <skip /> <!-- Match this with the constants in WifiDialog. --> <skip />