diff options
| author | Nick Pelly <npelly@google.com> | 2010-12-06 17:45:25 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-06 17:45:25 -0800 |
| commit | ea294903ca4c298c44b50b473b9b10ae2b77c9e3 (patch) | |
| tree | a2ea1daad342fc0f739dbee77c2fe0aa37eec0ae | |
| parent | 23b791cd0f725d188b84dabfd9eeab4e3775b869 (diff) | |
| parent | eba947a32a0233b3a2b384c580ab47bc7f27bb4d (diff) | |
| download | frameworks_base-ea294903ca4c298c44b50b473b9b10ae2b77c9e3.zip frameworks_base-ea294903ca4c298c44b50b473b9b10ae2b77c9e3.tar.gz frameworks_base-ea294903ca4c298c44b50b473b9b10ae2b77c9e3.tar.bz2 | |
am eba947a3: Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
* commit 'eba947a32a0233b3a2b384c580ab47bc7f27bb4d':
Remove ACTION_TAG_DISCOVERED from protected broadcast list.
| -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 07a48e7..b83aea8 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -86,7 +86,6 @@ <protected-broadcast android:name="android.hardware.action.USB_DISCONNECTED" /> <protected-broadcast android:name="android.hardware.action.USB_STATE" /> - <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" /> |