We were too clever! Restoring the default folder name.

Change-Id: I363328040be78e395abf1903212c93b8bbe54f08

res/values/strings.xml

@@ -200,7 +200,7 @@ s -->
     <skip />    
 
     <!-- The Google Apps folder name -->
-    <string name="google_apps_folder_name">Google Apps</string>
+    <string name="google_apps_folder_name">Google</string>
 
     <!-- Text to show user in place of a gadget when we can't display it properly -->
     <string name="gadget_error_text">Problem loading widget</string>

res/xml/default_workspace.xml

@@ -37,7 +37,8 @@
     <folder
         launcher:screen="2"
         launcher:x="3"
-        launcher:y="3">
+        launcher:y="3"
+        launcher:title="@string/google_apps_folder_name">
         <favorite
             launcher:packageName="com.google.android.apps.plus"
             launcher:className="com.google.android.apps.plus.phone.HomeActivity" />