Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Import translations. DO NOT MERGE

Change-Id: I41773739f5ea8048b1242f528a40af401d1780dc
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 1cc8eaf..62897b3 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -2,5 +2,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="wallpaper_label" msgid="5531350352180127395">"फुल्काहरू"</string>
-    <string name="wallpaper_author" msgid="2347976935955560839">"गुगल"</string>
+    <string name="wallpaper_author" msgid="2347976935955560839">"Google"</string>
 </resources>