diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-21 13:46:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 13:46:55 -0700 |
| commit | 834735a955e0e3110a3103179b877cd00d8dcd1f (patch) | |
| tree | 00f70c3eeb57169ac03f7b56029de645a32ab55b /AndroidManifest.xml | |
| parent | 0fda1ad88c8da426c1e8e88107b05336d135f4cb (diff) | |
| parent | 029f23c32c9fe0c7f288d383a8704bfa420d4ed0 (diff) | |
| download | packages_apps_Settings-834735a955e0e3110a3103179b877cd00d8dcd1f.tar.gz packages_apps_Settings-834735a955e0e3110a3103179b877cd00d8dcd1f.tar.bz2 packages_apps_Settings-834735a955e0e3110a3103179b877cd00d8dcd1f.zip | |
am 029f23c3: am ff8018dc: Merge "Fix NFC permission." into gingerbread
Merge commit '029f23c32c9fe0c7f288d383a8704bfa420d4ed0'
* commit '029f23c32c9fe0c7f288d383a8704bfa420d4ed0':
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 eb2ae6aaa..b7978aae5 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" /> |