diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-20 16:47:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-20 16:47:25 -0700 |
| commit | 029f23c32c9fe0c7f288d383a8704bfa420d4ed0 (patch) | |
| tree | 43ed84e2324fb6ea5966a61ea71780096eccde4c /AndroidManifest.xml | |
| parent | 5cfa75875fcb2701fbe3b8cf861c4c1d0e38e5e7 (diff) | |
| parent | ff8018dcbd0488160519481d4ca1567fa397d44e (diff) | |
| download | packages_apps_settings-029f23c32c9fe0c7f288d383a8704bfa420d4ed0.zip packages_apps_settings-029f23c32c9fe0c7f288d383a8704bfa420d4ed0.tar.gz packages_apps_settings-029f23c32c9fe0c7f288d383a8704bfa420d4ed0.tar.bz2 | |
am ff8018dc: Merge "Fix NFC permission." into gingerbread
Merge commit 'ff8018dcbd0488160519481d4ca1567fa397d44e' into gingerbread-plus-aosp
* commit 'ff8018dcbd0488160519481d4ca1567fa397d44e':
Fix NFC permission.
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 0d7c1bd..687a5a2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -14,7 +14,7 @@ <uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> - <uses-permission android:name="com.trustedlogic.trustednfc.permission.NFC_ADMIN" /> + <uses-permission android:name="android.permission.NFC" /> <uses-permission android:name="android.permission.HARDWARE_TEST" /> <uses-permission android:name="android.permission.CALL_PHONE" /> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> |