Merge "Screen saver string fixes" into nyc-dev am: 990ef94b64

am: 80f32e1dce

* commit '80f32e1dce8015d29fe920acb13e40dcf8518693':
  Screen saver string fixes

Change-Id: Ia9be0152b34a91c7173db5ff78138278d2085aa7
This commit is contained in:
Jason Monk
2016-04-21 16:00:27 +00:00
committed by android-build-merger

View File

@@ -2138,7 +2138,7 @@
<!-- Dream settings screen, caption for when dreams are disabled -->
<string name="screensaver_settings_disabled_prompt">To control what happens when the phone is docked and/or sleeping, turn screen saver on.</string>
<!-- Dream settings screen, action label, when to dream -->
<string name="screensaver_settings_when_to_dream">When to turn screen saver on</string>
<string name="screensaver_settings_when_to_dream">When to start screen saver</string>
<!-- Dream settings screen, button label to start dreaming -->
<string name="screensaver_settings_dream_start">Start now</string>
<!-- Dream settings screen, button label for settings for a specific screensaver -->