diff options
| author | Nick Pelly <npelly@google.com> | 2011-11-21 16:05:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-21 16:05:27 -0800 |
| commit | 3d547e0dda7ad58108a219c7ef20bab426d5ea38 (patch) | |
| tree | 88f3e8998d723988638af453d50a2025fd029b03 /include | |
| parent | c96d2aeed70f930d26236a20f6d32f0a24d83bd8 (diff) | |
| parent | f9c1fcc505d59fd87392e6af7341b1737f186081 (diff) | |
| download | system_core-3d547e0dda7ad58108a219c7ef20bab426d5ea38.zip system_core-3d547e0dda7ad58108a219c7ef20bab426d5ea38.tar.gz system_core-3d547e0dda7ad58108a219c7ef20bab426d5ea38.tar.bz2 | |
am f9c1fcc5: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
* commit 'f9c1fcc505d59fd87392e6af7341b1737f186081':
Replace vendor specific NfcGoogle.apk with generic Nfc.apk
Diffstat (limited to 'include')
| -rw-r--r-- | include/private/android_filesystem_config.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h index 2cc673f..ce1e55d 100644 --- a/include/private/android_filesystem_config.h +++ b/include/private/android_filesystem_config.h @@ -58,8 +58,9 @@ #define AID_UNUSED1 1022 /* deprecated, DO NOT USE */ #define AID_MEDIA_RW 1023 /* internal media storage write access */ #define AID_MTP 1024 /* MTP USB driver access */ -#define AID_NFC 1025 /* nfc subsystem */ +#define AID_UNUSED2 1025 /* deprecated, DO NOT USE */ #define AID_DRMRPC 1026 /* group for drm rpc */ +#define AID_NFC 1027 /* nfc subsystem */ #define AID_SHELL 2000 /* adb and debug shell user */ #define AID_CACHE 2001 /* cache access */ |