commit 9bd696bc31ddaeb261e177f4a69530c6722b4702
author Romain Guy <romainguy@android.com> Sun Jul 19 20:20:14 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sun Jul 19 20:20:14 2009 -0700
tree 87cb73f19631be6cadea448568546f7e8fd34275
parent c4f3925819f2497cf08f492e1f9224305ac09d46
parent 6c8bbcb5a2bbae2c83e1c684c2a06b8b72b47f52

am 6c8bbcb5: Fixes #1930069. Prevents NPE in GesturesActivity. Ensures the store is always != null.

Merge commit '6c8bbcb5a2bbae2c83e1c684c2a06b8b72b47f52'

* commit '6c8bbcb5a2bbae2c83e1c684c2a06b8b72b47f52':
  Fixes #1930069. Prevents NPE in GesturesActivity. Ensures the store is always != null.

res/xml/default_workspace.xml

diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml
index 9197c30..60bfe82 100644
--- a/res/xml/default_workspace.xml
+++ b/res/xml/default_workspace.xml
@@ -42,12 +42,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"