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

# By Venkataraman Nerellapalli
# Via Android Git Automerger (1) and others
* commit '61b0f8c88ab6c8254230aa7953bf619934d7d756':
  Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot
This commit is contained in:
Irfan Sheriff
2013-01-25 17:11:31 -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. -->
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
<string-array name="wifi_ap_security" translatable="false">
<item>Open</item>
<!-- Do not translate. -->
<item>WPA PSK</item>
<!-- Do not translate. -->
<item>WPA2 PSK</item>
<string-array name="wifi_ap_security">
<item>@string/wifi_security_none</item>
<item>@string/wifi_security_wpa</item>
<item>@string/wifi_security_wpa2</item>
</string-array>
<!-- Match this with the constants in WifiDialog. --> <skip />