am 26ac83df: Merge "Settings: Remove master swtich from battery saver." into lmp-preview-dev

* commit '26ac83df5922430b7d7e3eee46c36c7d856bc47c':
  Settings: Remove master swtich from battery saver.
This commit is contained in:
John Spurlock
2014-06-12 18:37:34 +00:00
committed by Android Git Automerger
3 changed files with 44 additions and 67 deletions

View File

@@ -3741,6 +3741,9 @@
<!-- [CHAR_LIMIT=40] Battery saver: Label for feature, title + menu item -->
<string name="battery_saver">Battery saver</string>
<!-- [CHAR_LIMIT=40] Battery saver: Title for always on option -->
<string name="battery_saver_always_on_title">Always on</string>
<!-- [CHAR_LIMIT=40] Battery saver: Title for automatic entry option -->
<string name="battery_saver_turn_on_automatically_title">Turn on automatically</string>
@@ -3751,7 +3754,7 @@
<string name="battery_saver_turn_on_automatically_pct">at %1$d%% battery</string>
<!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
<string name="battery_saver_description">To help improve battery life, Battery saver will reduce your devices performance.\n\nBattery saver will turn off when your device is plugged in.</string>
<string name="battery_saver_description">To help improve battery life, Battery saver will reduce your devices performance.\n\nBattery saver will be disabled when your device is plugged in.</string>
<!-- Process Stats strings -->
<skip />