Automated import from //branches/cupcake/...@142994,142994
diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml
index 0cbba14..7079e9e 100644
--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -33,8 +33,6 @@
             android:label="@string/activity_sample_code"
             android:icon="@drawable/app_sample_code" >
 
-        <uses-library android:name="com.google.android.maps" />
-
         <activity android:name="ApiDemos">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1305,20 +1303,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".view.MapViewDemo" android:label="Views/MapView">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".view.MapViewCompassDemo" android:label="Views/MapView and Compass">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-
         <!-- ************************************* -->
         <!--           GRAPHICS SAMPLES            -->
         <!-- ************************************* -->