From a170bb81d5953c1f0aa0f5f49bd72eb43c50e233 Mon Sep 17 00:00:00 2001
From: Nick Kralevich <nnk@google.com>
Date: Wed, 5 Dec 2012 16:11:42 -0800
Subject: [PATCH] Remove duplicate AndroidManifest.xml entries.

The automerger added the entries twice...

Change-Id: I7910cb2126b339b0c8aee11051db1a2de8ae26ae
---
 core/res/AndroidManifest.xml | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 2a357afc28ef8..316de5067b758 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -168,31 +168,6 @@
 
 
 
-    <protected-broadcast android:name="android.intent.action.ANY_DATA_STATE" />
-
-    <protected-broadcast android:name="com.android.server.WifiManager.action.START_SCAN" />
-    <protected-broadcast android:name="com.android.server.WifiManager.action.DELAYED_DRIVER_STOP" />
-    <protected-broadcast android:name="android.net.wifi.WIFI_STATE_CHANGED" />
-    <protected-broadcast android:name="android.net.wifi.WIFI_AP_STATE_CHANGED" />
-    <protected-broadcast android:name="android.net.wifi.SCAN_RESULTS" />
-    <protected-broadcast android:name="android.net.wifi.RSSI_CHANGED" />
-    <protected-broadcast android:name="android.net.wifi.STATE_CHANGE" />
-    <protected-broadcast android:name="android.net.wifi.LINK_CONFIGURATION_CHANGED" />
-    <protected-broadcast android:name="android.net.wifi.CONFIGURED_NETWORKS_CHANGE" />
-    <protected-broadcast android:name="android.net.wifi.supplicant.CONNECTION_CHANGE" />
-    <protected-broadcast android:name="android.net.wifi.supplicant.STATE_CHANGE" />
-    <protected-broadcast android:name="android.net.wifi.p2p.STATE_CHANGED" />
-    <protected-broadcast android:name="android.net.wifi.p2p.DISCOVERY_STATE_CHANGE" />
-    <protected-broadcast android:name="android.net.wifi.p2p.THIS_DEVICE_CHANGED" />
-    <protected-broadcast android:name="android.net.wifi.p2p.PEERS_CHANGED" />
-    <protected-broadcast android:name="android.net.wifi.p2p.CONNECTION_STATE_CHANGE" />
-    <protected-broadcast android:name="android.net.wifi.p2p.PERSISTENT_GROUPS_CHANGED" />
-    <protected-broadcast android:name="android.net.conn.TETHER_STATE_CHANGED" />
-    <protected-broadcast android:name="android.net.conn.INET_CONDITION_ACTION" />
-
-
-
-
     <!-- ====================================== -->
     <!-- Permissions for things that cost money -->
     <!-- ====================================== -->