PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of f2801e4 to nyc-mr1-dev

Browse Source 
am: b01c080b08

Change-Id: I7eb92f48024bf8298f2a31c0acfa87a355be872a
This commit is contained in:
Lorenzo Colitti
2016-10-06 20:27:49 +00:00
committed by android-build-merger
parent 9264154bee b01c080b08
commit be3924c1b6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -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-->