Merge commit '377c7c9' into merge2

This commit is contained in:
Etan Cohen
2015-04-24 14:39:03 -07:00
4 changed files with 81 additions and 52 deletions

View File

@@ -324,6 +324,17 @@
<item>AKA\'</item>
</string-array>
<!-- Wi-Fi AP band settings. Either 2.4GHz or 5GHz. -->
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
<string-array name="wifi_ap_band_config_full">
<item>@string/wifi_ap_choose_2G</item>
<item>@string/wifi_ap_choose_5G</item>
</string-array>
<string-array name="wifi_ap_band_config_2G_only">
<item>@string/wifi_ap_choose_2G</item>
</string-array>
<!-- Wi-Fi WPS setup for p2p connections. -->
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
<string-array name="wifi_p2p_wps_setup">