commit 17b182f9970c8a085e8f6427251531e21e3595eb
author Jeff Sharkey <jsharkey@android.com> Mon May 11 18:26:50 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Mon May 11 18:26:50 2009 -0700
tree 02929cce4d110a05743d6a1ca9108dd092df95b4
parent d226e0a2cc5048884ff4fb9f6ed958099cacd363
parent 83f111d129fcb8c50b35da789f0d75604b9c0864

am 83f111d: Prevent race condition when cancelling long-press for scroll

Merge commit '83f111d129fcb8c50b35da789f0d75604b9c0864'

* commit '83f111d129fcb8c50b35da789f0d75604b9c0864':
  Prevent race condition when cancelling long-press for scroll.

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"