am 02d8341c: am 740de4d3: am 3ac7802e: Fix duplicate string resources

* commit '02d8341ca4dc3db2262eac8ce4bd56de46687655':
  Fix duplicate string resources
This commit is contained in:
Tadashi G. Takaoka
2014-07-18 03:14:28 +00:00
committed by Android Git Automerger

View File

@@ -1296,8 +1296,6 @@
<!-- Wifi Assistant title string. [CHAR LIMIT=20] -->
<string name="wifi_assistant_intro_setup">Introducing\nWi\u2011Fi Assistant</string>
<!-- Wifi Assistant title string. [CHAR LIMIT=40] -->
<string name="wifi_assistant_title">Wi\u2011Fi Assistant</string>
<!-- Wifi Assistant No, thanks string. Text to say no to wifi assistant. [CHAR LIMIT=20] -->
<string name="wifi_assistant_no_thanks">NO, THANKS</string>
<!-- Wifi Assistant setup string. Text to say yes to wifi assistant and begin setup. [CHAR LIMIT=20] -->
@@ -4848,7 +4846,7 @@
<!-- Data Usage Foreground label. [CHAR LIMIT=40] -->
<string name="data_usage_forground_label">Foreground:</string>
<!-- Data Usage Background label. [CHAR LIMIT=40] -->
<string name="data_usage_forground_label">Background:</string>
<string name="data_usage_background_label">Background:</string>
<!-- Button title for launching application-specific data usage settings. [CHAR LIMIT=32] -->
<string name="data_usage_app_settings">View app settings</string>
<!-- Checkbox label that restricts background data usage of a specific application. [CHAR LIMIT=32] -->