am bb593755: Merge change 2865 into donut

Merge commit 'bb593755d2fa8980855072dfdc72aae3adb2e6dd'

* commit 'bb593755d2fa8980855072dfdc72aae3adb2e6dd':
  Fixes #1890155.
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"