diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-29 08:20:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-29 08:20:28 -0700 |
| commit | 4611bb1814afc7dcc3177cbb248bfb5ee1662ba0 (patch) | |
| tree | 7e1817b0a5e1f0e4cf91ea43721d3eb2ec384ac4 /core/res/AndroidManifest.xml | |
| parent | 6e9f6d1e037139d2ef106b03b8f27248764169d8 (diff) | |
| parent | ba1664b34cc33ebb6b45fccedb35298ff8b1d998 (diff) | |
| download | frameworks_base-4611bb1814afc7dcc3177cbb248bfb5ee1662ba0.zip frameworks_base-4611bb1814afc7dcc3177cbb248bfb5ee1662ba0.tar.gz frameworks_base-4611bb1814afc7dcc3177cbb248bfb5ee1662ba0.tar.bz2 | |
am ba1664b3: am 4bf4b491: Merge "Hide some NFC API\'s." into gingerbread
* commit 'ba1664b34cc33ebb6b45fccedb35298ff8b1d998':
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 22a80f5..2444fce 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.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" /> |