Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I9588dab538d484ea5843f0a156139e57f6113199
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index eed67cd..de064cd 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/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">"বেসিক স্ক্রিনসেভার"</string>
+    <string name="app_name" msgid="6121278918841215202">"বেসিক ডেড্রিম"</string>
     <string name="color_dream_name" msgid="9063813186991472050">"রঙ"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index c226fc3..ba1c8f7 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/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">"เดย์ดรีมเบื้องต้น"</string>
+    <string name="app_name" msgid="6121278918841215202">"Daydream เบื้องต้น"</string>
     <string name="color_dream_name" msgid="9063813186991472050">"สี"</string>
 </resources>