Merge "No need for "and" - ListFormatter adds it" into pi-dev

am: fa01fcb2c9

Change-Id: If899d486356937f740a959f1ca6d94b8675d857a
This commit is contained in:
Beverly
2018-05-31 14:24:11 -07:00
committed by android-build-merger

View File

@@ -7969,8 +7969,8 @@
<!-- Zen mode settings: Starred contacts summary [CHAR LIMIT=NONE] --> <!-- Zen mode settings: Starred contacts summary [CHAR LIMIT=NONE] -->
<plurals name="zen_mode_starred_contacts_summary_additional_contacts"> <plurals name="zen_mode_starred_contacts_summary_additional_contacts">
<item quantity="one">and 1 other</item> <item quantity="one">1 other</item>
<item quantity="other">and <xliff:g id="num_people" example="3">%d</xliff:g> others</item> <item quantity="other"><xliff:g id="num_people" example="3">%d</xliff:g> others</item>
</plurals> </plurals>
<!-- [CHAR LIMIT=20] Zen mode settings: Messages option --> <!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->