Merge "resolve merge conflicts of f2801e4
to nyc-mr1-dev" into nyc-mr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
365d95b69a
@@ -1596,7 +1596,7 @@
|
|||||||
<!-- Preference title for option to automatically switch away from bad wifi networks [CHAR LIMIT=60]-->
|
<!-- Preference title for option to automatically switch away from bad wifi networks [CHAR LIMIT=60]-->
|
||||||
<string name="wifi_cellular_data_fallback_title">Switch to cellular data automatically</string>
|
<string name="wifi_cellular_data_fallback_title">Switch to cellular data automatically</string>
|
||||||
<!-- Preference summary for option to automatically switch away from bad wifi networks [CHAR LIMIT=None]-->
|
<!-- Preference summary for option to automatically switch away from bad wifi networks [CHAR LIMIT=None]-->
|
||||||
<string name="wifi_cellular_data_fallback_summary">Use cellular data when Wi\u2011Fi loses Internet access. Data usage may apply.</string>
|
<string name="wifi_cellular_data_fallback_summary">Use cellular data when Wi\u2011Fi has no Internet access. Data usage may apply.</string>
|
||||||
<!-- Action bar text message to manually add a wifi network [CHAR LIMIT=20]-->
|
<!-- Action bar text message to manually add a wifi network [CHAR LIMIT=20]-->
|
||||||
<string name="wifi_add_network">Add network</string>
|
<string name="wifi_add_network">Add network</string>
|
||||||
<!-- Header for the list of wifi networks-->
|
<!-- Header for the list of wifi networks-->
|
||||||
|
Reference in New Issue
Block a user