am 3a5a82c7: Merge "Fix string breakage."

* commit '3a5a82c756f8001fabe1ddd158825565354425a6':
  Fix string breakage.
This commit is contained in:
Jeff Sharkey
2011-10-05 22:16:17 -07:00
committed by Android Git Automerger

View File

@@ -3534,9 +3534,9 @@ found in the list of installed apps.</string>
<string name="data_usage_label_background">Background</string>
<!-- Disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
<string name="data_usage_disclaimer" product="default">Measured by your phone. Your carrier's data usage accounting may differ.</string>
<string name="data_usage_disclaimer" product="default">Measured by your phone. Your carrier\'s data usage accounting may differ.</string>
<!-- Disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
<string name="data_usage_disclaimer" product="tablet">Measured by your tablet. Your carrier's data usage accounting may differ.</string>
<string name="data_usage_disclaimer" product="tablet">Measured by your tablet. Your carrier\'s data usage accounting may differ.</string>
<!-- Body of dialog shown to request confirmation that mobile data will be disabled. [CHAR LIMIT=NONE] -->
<string name="data_usage_disable_mobile">Disable mobile data?</string>