am 59ea80b7: Merge "Settings: No really, keep the trailing space." into lmp-dev

* commit '59ea80b781d8c541076f185cfa81084668521ba5':
  Settings: No really, keep the trailing space.
This commit is contained in:
John Spurlock
2014-07-22 19:26:32 +00:00
committed by Android Git Automerger

View File

@@ -5708,7 +5708,7 @@
<string name="zen_mode_entry_conditions_title">Automatically turn on</string>
<!-- [CHAR LIMIT=40] General divider text when concatenating multiple items in a text summary -->
<string name="summary_divider_text">, </string>
<string name="summary_divider_text">,\u0020</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Entry conditions option: value when blank -->
<string name="zen_mode_entry_conditions_summary_none">Never</string>