commit 5109d6b923137014cd2721c600e8bacb4eba2484
author Divya Sharma <c_shard@codeaurora.org> Wed Nov 04 09:37:08 2015 -0800
committer Divya Sharma <c_shard@codeaurora.org> Wed Nov 04 09:37:08 2015 -0800
tree 0a6f4f69579795b36728d5637d4d529771813db2
parent d28d000684290009b3b615a6ac7fd9a858744fa0
parent 2f0660b447f6dc4d0048450f5198c2345422e46b

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
  Import translations. DO NOT MERGE

Change-Id: Ife4b8336194f6dce7e8567db1e09ad3896d89c33

res/values-ne-rNP/strings.xml

diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 1421b49..dfdda84 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -17,6 +17,6 @@
 <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="6550661498344222236">"होलो घुम्रिएको"</string>
-    <string name="wallpaper_author" msgid="6691686743046578947">"गुगल"</string>
+    <string name="wallpaper_author" msgid="6691686743046578947">"Google"</string>
     <string name="wallpaper_description" msgid="7209342332803075999">"होलो थिम्ड घुम्रिएको ‍‍वालपेपर"</string>
 </resources>