commit 365d95b69a6e87a04d15e2af85fb8275ae3dd56e
author Lorenzo Colitti <lorenzo@google.com> Mon Oct 03 23:37:09 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 03 23:37:10 2016 +0000
tree 3886847883cb312f00bbe0ce52b22a9ea55ccf78
parent 7ac78f2daf482a121bc17018653f187147f1bdf6
parent b01c080b086d77c3f1f75e92c4096198411b2aef

Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 990057b..a8bd8e7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1596,7 +1596,7 @@
     <!-- 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>
     <!-- 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]-->
     <string name="wifi_add_network">Add network</string>
     <!-- Header for the list of wifi networks-->