Merge "Don\'t reference framework strings." into nyc-dev am: 179a57b21f

am: 3fd9a62b39

* commit '3fd9a62b397f7c37aef4c1d13db96615a3cb45f7':
  Don't reference framework strings.
This commit is contained in:
Julia Reynolds
2016-03-08 21:55:32 +00:00
committed by android-build-merger

View File

@@ -5870,7 +5870,7 @@
<string name="emergency_tone_vibrate">Vibrate</string>
<!-- Sound: Title for the Do not Disturb option and associated settings page. [CHAR LIMIT=30] -->
<string name="zen_mode_settings_title" translatable="false">@*android:string/zen_mode_feature_name</string>
<string name="zen_mode_settings_title" translatable="false">Do not disturb</string>
<!-- Do not disturb: Title for the Priority interruptions option and associated settings page. [CHAR LIMIT=30] -->
<string name="zen_mode_priority_settings_title">Priority only allows</string>