am 3b1baf4b: am 485a7e59: Merge "[WifiSetup] Update title string" into lmp-mr1-dev

* commit '3b1baf4b18c8176ba76d4527cb5740c0ace2cf91':
  [WifiSetup] Update title string
This commit is contained in:
Maurice Lam
2014-11-21 21:40:38 +00:00
committed by Android Git Automerger

View File

@@ -1413,7 +1413,7 @@
<!-- Summary text of the Wi-fi settings screen -->
<string name="wifi_settings_summary">Set up &amp; manage wireless access points</string>
<!-- Used in the 1st-level settings screen to turn on Wi-Fi [CHAR LIMIT=60] -->
<string name="wifi_setup_wizard_title">Select Wi\u2011Fi</string>
<string name="wifi_setup_wizard_title">Select Wi\u2011Fi network</string>
<!-- Used by Account creation for turning on Wi-Fi [CHAR LIMIT=60] -->
<string name="wifi_select_network">Select Wi\u2011Fi</string>
<!-- Summary text when turning Wi-Fi or bluetooth on -->