commit 60d57976bc195f52526deec6bb0a5e614117ba2b
author Beverly <beverlyt@google.com> Thu May 31 14:24:11 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 31 14:24:11 2018 -0700
tree ec8e6c46af5fc36287a0db21837b425a3cc12a85
parent 2c7fe6f8eafe12ea1d2d3b3fca976bd4a72273b9
parent fa01fcb2c9004493f81e0528e7ada9e2474129a7

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

Change-Id: If899d486356937f740a959f1ca6d94b8675d857a

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0448fb2..c45923b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7969,8 +7969,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 -->