am 93e95153: Merge change 6127 into donut

Merge commit '93e95153482f30c76f0d14eb9789a5000a444ae3'

* commit '93e95153482f30c76f0d14eb9789a5000a444ae3':
  Remove SearchAutocompleteTextView from Launcher.
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"