commit fdee0fea9fbc2739f527f0d3399b863d9aa12fb8
author The Android Automerger <android-build@google.com> Tue Oct 27 01:00:27 2015 -0700
committer The Android Automerger <android-build@google.com> Tue Oct 27 01:00:27 2015 -0700
tree 226ab546e5b9f814c675860e7cc1dec3853f5bf3
parent 272f536bdcea60bf8d8231464712c80491704928
parent 0893fd1df04fc544fddd356ff9dc2d76fc4ec94f

merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev

VolantisLayout/res/values-nb/strings.xml

diff --git a/VolantisLayout/res/values-nb/strings.xml b/VolantisLayout/res/values-nb/strings.xml
index c3da5aa..af55014 100644
--- a/VolantisLayout/res/values-nb/strings.xml
+++ b/VolantisLayout/res/values-nb/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="4333089353149619778">"Startside for Nexus 9"</string>
-    <string name="google_folder_title" msgid="375890659159312012">"Google-apper"</string>
+    <string name="google_folder_title" msgid="375890659159312012">"Google"</string>
     <string name="create_folder_title" msgid="5720573466924789097">"Opprett"</string>
     <string name="play_folder_title" msgid="3260420724119064282">"Play"</string>
 </resources>