Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ie4e99d75619990884aec77e04107ed185b8f69a6
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 35becd1..d9372dd 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="color_picker_default_title" msgid="1248663997452044787">"ಬಣ್ಣ ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="color_picker_default_title" msgid="1248663997452044787">"ಬಣ್ಣವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="color_swatch_description" msgid="2883438431173736180">"ಬಣ್ಣ <xliff:g id="COLOR_INDEX">%1$d</xliff:g>"</string>
     <string name="color_swatch_description_selected" msgid="5020921249944943124">"<xliff:g id="COLOR_INDEX">%1$d</xliff:g> ಬಣ್ಣವನ್ನು ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ"</string>
 </resources>