am c7a21b5: Merge change 1274 into donut

Merge commit 'c7a21b5fe07837a1146f9781c1787100b8c04e84'

* commit 'c7a21b5fe07837a1146f9781c1787100b8c04e84':
  Modify comments in Launcher strings for global search.
diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml
index 2280b61..cc5f911 100644
--- a/res/xml/default_workspace.xml
+++ b/res/xml/default_workspace.xml
@@ -47,12 +47,14 @@
         launcher:x="2"
         launcher:y="3" />
 
+<!--
     <favorite
         launcher:packageName="com.google.android.apps.maps"
         launcher:className="com.google.android.maps.MapsActivity"
         launcher:screen="1"
         launcher:x="3"
         launcher:y="3" />
+-->
 
     <favorite
         launcher:packageName="com.android.mms"