commit 39659be8f396d3ace344a42db407ded8ec9049a1
author Derek Sollenberger <djsollen@google.com> Thu Dec 10 06:57:26 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 10 06:57:26 2009 -0800
tree 1d1d3f20581645dbf92f6a247536d27369b2b404
parent 8cf03efd029cf9939ad0562f7773ef03304ac3bd
parent 387ffb97553ad872b5f9dce6a08ad68044086d91

am 387ffb97: am 100a4f32: Cleaning up unused plugin declarations from the manifest.

Merge commit '387ffb97553ad872b5f9dce6a08ad68044086d91'

* commit '387ffb97553ad872b5f9dce6a08ad68044086d91':
  Cleaning up unused plugin declarations from the manifest.

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c5324cd..fdf0327 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -151,10 +151,6 @@
                   android:configChanges="orientation|keyboardHidden">
         </activity>
 
-        <activity android:name="BrowserPluginList" android:label=""
-                  android:configChanges="orientation|keyboardHidden">
-        </activity>
-
         <activity android:name="WebsiteSettingsActivity" android:label=""
                   android:configChanges="orientation|keyboardHidden">
         </activity>
@@ -184,13 +180,6 @@
         <!-- Makes .BrowserActivity the search target for any activity in Browser -->
         <meta-data android:name="android.app.default_searchable" android:value=".BrowserActivity" />
 
-        <activity android:name="android.webkit.PluginActivity">
-            <intent-filter>
-                <action android:name="android.intent.webkit.PLUGIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
     </application>
 
 </manifest>