diff options
| author | Nick Pelly <npelly@google.com> | 2010-12-06 17:48:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-06 17:48:38 -0800 |
| commit | 7458091ffc7c5b3ff9220351bb9e55da5d87f545 (patch) | |
| tree | 16b71359d9e90c620d601ba3659045c737b05e3d /core/res/AndroidManifest.xml | |
| parent | d9e37dfaccfe4d2af82e7fc754bc294b8a403500 (diff) | |
| parent | ea294903ca4c298c44b50b473b9b10ae2b77c9e3 (diff) | |
| download | frameworks_base-7458091ffc7c5b3ff9220351bb9e55da5d87f545.zip frameworks_base-7458091ffc7c5b3ff9220351bb9e55da5d87f545.tar.gz frameworks_base-7458091ffc7c5b3ff9220351bb9e55da5d87f545.tar.bz2 | |
am ea294903: am eba947a3: Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
* commit 'ea294903ca4c298c44b50b473b9b10ae2b77c9e3':
Remove ACTION_TAG_DISCOVERED from protected broadcast list.
Diffstat (limited to 'core/res/AndroidManifest.xml')
| -rw-r--r-- | core/res/AndroidManifest.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a2666e2..92b50c7 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -88,7 +88,6 @@ <protected-broadcast android:name="android.hardware.action.USB_CAMERA_ATTACHED" /> <protected-broadcast android:name="android.hardware.action.USB_CAMERA_DETACHED" /> - <protected-broadcast android:name="android.nfc.action.TAG_DISCOVERED" /> <protected-broadcast android:name="android.nfc.action.LLCP_LINK_STATE_CHANGED" /> <protected-broadcast android:name="android.nfc.action.TRANSACTION_DETECTED" /> <protected-broadcast android:name="android.intent.action.CLEAR_DNS_CACHE" /> |