Merge "Settings: Fix ordering for interruptions alarm warning." into lmp-dev

This commit is contained in:
John Spurlock
2014-07-30 16:34:50 +00:00
committed by Android (Google) Code Review
3 changed files with 7 additions and 8 deletions

View File

@@ -5797,7 +5797,7 @@
<string name="zen_mode_from_starred">Starred contacts only</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>
<string name="zen_mode_alarm_info">Alarms and other personal reminders are always priority</string>
<!-- [CHAR LIMIT=20] Zen mode settings: When option -->
<string name="zen_mode_when">Automatically turn on</string>