am 5c9874ce: am 53d67679: am 9d95d884: am 7e23bae6: am d7fb46de: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev

* commit '5c9874cefd9bc35c191c85a7744734b0a90a055c':
  Need to disable 5GHz bands for WiFi tethering in Japan
This commit is contained in:
xinhe
2015-07-15 00:04:00 +00:00
committed by Android Git Automerger
2 changed files with 17 additions and 4 deletions

View File

@@ -1380,6 +1380,8 @@
<string name="wifi_stopping">Turning off Wi\u2011Fi\u2026</string>
<!-- Summary text when Wi-Fi or bluetooth has error -->
<string name="wifi_error">Error</string>
<!-- Summary text when wifi SoftAP started failed due to no legal usable channel allowed in this region by regulatory -->
<string name="wifi_sap_no_channel_error">5 GHz band not available in this country</string>
<!-- Toast message when Wi-Fi or bluetooth is disallowed in airplane mode -->
<string name="wifi_in_airplane_mode">In Airplane mode</string>
<!-- Checkbox title for option to notify user when open networks are nearby -->