commit a5080b83defd7ddf89d5d89d9ab59606dc719823
author Xin Li <delphij@google.com> Mon Feb 25 01:33:24 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Feb 25 01:33:24 2019 -0800
tree fcc0349353273aa62f307117a83b9f1fdb7bbef0
parent 4bc477286ad43112390511992b962d47121522a5
parent f4eb173c45c03deabf720baaceb181fef672937a

Merge stage-aosp-master into pi-dev-plus-aosp
am: f4eb173c45

Change-Id: I4587a9ac221f012769aad1a2c712237c88ddc40d

res/values-as/strings.xml

diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 57c38e9..465ecd1 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="6121278918841215202">"ডে\'ড্ৰিমৰ প্ৰাথমিক সংস্কৰণ"</string>
-    <string name="color_dream_name" msgid="9063813186991472050">"ৰং"</string>
+    <string name="color_dream_name" msgid="9063813186991472050">"ৰংবোৰ"</string>
 </resources>

res/values-en-rXC/strings.xml

diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index a0f9676..84a5a47 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -16,6 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="6121278918841215202">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‏‎‎‎‏‎‎Basic Daydreams‎‏‎‎‏‎"</string>
-    <string name="color_dream_name" msgid="9063813186991472050">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎Colors‎‏‎‎‏‎"</string>
+    <string name="app_name" msgid="6121278918841215202">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‎‎‏‏‏‎‎‎‏‎‎Basic Daydreams‎‏‎‎‏‎"</string>
+    <string name="color_dream_name" msgid="9063813186991472050">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎Colors‎‏‎‎‏‎"</string>
 </resources>

res/values-or/strings.xml

diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 6dd4b1e..148e2d9 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="6121278918841215202">"ସାଧାରଣ ଡେ-ଡ୍ରିମ୍‌"</string>
-    <string name="color_dream_name" msgid="9063813186991472050">"ରଙ୍ଗଗୁଡିକ"</string>
+    <string name="color_dream_name" msgid="9063813186991472050">"ରଙ୍ଗ"</string>
 </resources>