commit 1ceb4be61e7f6cf40e017f6402e6ed2d12da3585
author The Android Automerger <android-build@google.com> Sun Jun 05 00:04:03 2016 -0700
committer The Android Automerger <android-build@google.com> Sun Jun 05 00:04:03 2016 -0700
tree 378267ced29dbd76592a73c7ffb0d629b8c48824
parent e946a53ce3ae0d68b3a77126928875ae1f3c43f4
parent fe420f3fdaa741578321d18cd8c6e64cfc7d506c

merge in nyc-release history after reset to nyc-dev

sample/res/values-ml-rIN/strings.xml

diff --git a/sample/res/values-ml-rIN/strings.xml b/sample/res/values-ml-rIN/strings.xml
index 54e4e76..1ee119a 100644
--- a/sample/res/values-ml-rIN/strings.xml
+++ b/sample/res/values-ml-rIN/strings.xml
@@ -2,7 +2,7 @@
 <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="559800164925277094">"PhotoViewerSample"</string>
-    <string name="menu_settings" msgid="1259682084875185697">"ക്രമീകരണങ്ങൾ"</string>
+    <string name="menu_settings" msgid="1259682084875185697">"ക്രമീകരണം"</string>
     <string name="title_activity_main" msgid="7695239211427024237">"MainActivity"</string>
     <string name="launch" msgid="2345080120370773520">"ഫോട്ടോ വ്യൂവർ സമാരംഭിക്കുക"</string>
 </resources>

sample/res/values-ne-rNP/strings.xml

diff --git a/sample/res/values-ne-rNP/strings.xml b/sample/res/values-ne-rNP/strings.xml
index c512e50..678706d 100644
--- a/sample/res/values-ne-rNP/strings.xml
+++ b/sample/res/values-ne-rNP/strings.xml
@@ -4,5 +4,5 @@
     <string name="app_name" msgid="559800164925277094">"PhotoViewerSample"</string>
     <string name="menu_settings" msgid="1259682084875185697">"सेटिङहरू"</string>
     <string name="title_activity_main" msgid="7695239211427024237">"MainActivity"</string>
-    <string name="launch" msgid="2345080120370773520">"फोटो देखाउने सुरु गर्नुहोस्"</string>
+    <string name="launch" msgid="2345080120370773520">"तस्बिर देखाउने सुरु गर्नुहोस्"</string>
 </resources>