Merge "Zen priority settings update" into oc-dr1-dev

am: 9dec71f7d7

Change-Id: I81e2609637537413bfd36ed9e0658d49d533a9cd
This commit is contained in:
Julia Reynolds
2017-07-20 14:23:51 +00:00
committed by android-build-merger
4 changed files with 58 additions and 10 deletions

View File

@@ -7181,6 +7181,9 @@
<!-- [CHAR LIMIT=50] Zen mode settings: Alarms option -->
<string name="zen_mode_alarms">Alarms</string>
<!-- [CHAR LIMIT=50] Zen mode settings: Alarms option summary -->
<string name="zen_mode_alarms_summary">Alarms are always a priority and make sound</string>
<!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
<string name="zen_mode_reminders">Reminders</string>