diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-29 08:15:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-29 08:15:48 -0700 |
| commit | ba1664b34cc33ebb6b45fccedb35298ff8b1d998 (patch) | |
| tree | ba3185c79d0a86a0d99d2e6270b2bd3e8b5e2130 /core/res/AndroidManifest.xml | |
| parent | faebca7f4319950927759163a703dd12f2727460 (diff) | |
| parent | 4bf4b491be3fbd0f71bb87749a0e31f817b91e08 (diff) | |
| download | frameworks_base-ba1664b34cc33ebb6b45fccedb35298ff8b1d998.zip frameworks_base-ba1664b34cc33ebb6b45fccedb35298ff8b1d998.tar.gz frameworks_base-ba1664b34cc33ebb6b45fccedb35298ff8b1d998.tar.bz2 | |
am 4bf4b491: Merge "Hide some NFC API\'s." into gingerbread
* commit '4bf4b491be3fbd0f71bb87749a0e31f817b91e08':
Hide some NFC API's.
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 a22c827..07a48e7 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.NDEF_TAG_DISCOVERED" /> <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" /> |