am 43b0f512: am 0ed91709: am 4bdf8b49: Merge "Replace missing resource." into lmp-dev

* commit '43b0f512d10a4ca1c1e33744cfdc796b3d1aea9c':
  Replace missing resource.
This commit is contained in:
Dan Sandler
2014-08-06 18:08:44 +00:00
committed by Android Git Automerger

View File

@@ -5773,6 +5773,9 @@
<!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when sensitive -->
<string name="app_notification_row_sensitive">Sensitive</string>
<!-- [CHAR LIMIT=20] Notification settings: App notifications dialog dismiss button caption -->
<string name="app_notifications_dialog_done">Done</string>
<!-- [CHAR LIMIT=30] Zen mode settings: Exit condition selection dialog, default option -->
<string name="zen_mode_default_option">Until you turn this off</string>