Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I05c3e0bd23592b6ea06c8c8da1c371d67895de3a
diff --git a/navigationbar/res/values-hi/strings.xml b/navigationbar/res/values-hi/strings.xml
index 6afe5e5..fc1e9da 100644
--- a/navigationbar/res/values-hi/strings.xml
+++ b/navigationbar/res/values-hi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"आगे"</string>
+    <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"अगला"</string>
     <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"पीछे"</string>
 </resources>
diff --git a/navigationbar/res/values-lt/strings.xml b/navigationbar/res/values-lt/strings.xml
index 38d22b1..183404c 100644
--- a/navigationbar/res/values-lt/strings.xml
+++ b/navigationbar/res/values-lt/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"Praleisti"</string>
+    <string name="setup_wizard_next_button_label" msgid="6681282266022780599">"Kitas"</string>
     <string name="setup_wizard_back_button_label" msgid="2863826823307023546">"Atgal"</string>
 </resources>