commit df3e5971c1200960243ed96bff5fca85faa634af
author Karl Rosaen Wed Apr 29 13:43:27 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed Apr 29 13:43:27 2009 -0700
tree 9f1bcf38beb5e4dff1351db237c00a305ad676a4
parent 74a15c0db0445d1df7b82ee46c65e260dd72dee8
parent 71b0594a6fc7339281add91d2ac61b181f89a2af

am 71b0594: Merge branch \'readonly-p4-donut\' into donut

Merge commit '71b0594a6fc7339281add91d2ac61b181f89a2af'

* commit '71b0594a6fc7339281add91d2ac61b181f89a2af':
  AI 147564: Merge back from search branch to donut.  Notes:

res/xml/default_workspace.xml

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"