am 384ad06e: am a8e0a5b5: Merge "Settings: Add to the zen alarm string." into lmp-dev

* commit '384ad06ec0357e8e9c7915f66d6795d6f9ba2819':
  Settings: Add to the zen alarm string.
This commit is contained in:
John Spurlock
2014-07-24 23:31:18 +00:00
committed by Android Git Automerger

View File

@@ -5784,8 +5784,8 @@
<!-- [CHAR LIMIT=30] Zen mode settings: From option value: Starred contacts -->
<string name="zen_mode_from_starred">Starred contacts only</string>
<!-- [CHAR LIMIT=60] Zen mode settings: Reminder text about alarms -->
<string name="zen_mode_alarm_info">Alarms are always priority interruptions</string>
<!-- [CHAR LIMIT=80] Zen mode settings: Reminder text about alarms -->
<string name="zen_mode_alarm_info">Alarms and other personal reminders are priority interruptions</string>
<!-- [CHAR LIMIT=20] Zen mode settings: When option -->
<string name="zen_mode_when">Automatically turn on</string>