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

am: 60d57976bc

Change-Id: I77f7aa7076786c6f3855f9b976cfa70e23f0d8a0
This commit is contained in:
Beverly
2018-05-31 16:03:12 -07:00
committed by android-build-merger

View File

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