diff options
| author | Jeff Hamilton <jham@android.com> | 2011-04-05 12:32:50 -0500 |
|---|---|---|
| committer | Jeff Hamilton <jham@android.com> | 2011-04-05 12:32:50 -0500 |
| commit | ee3420bc124613827af474684c3015d12742c70d (patch) | |
| tree | 41ac8e9ea5e6399623dc7f51b63ec0f4193eb425 | |
| parent | b6623abc414ea2a1d1ac3cbfef0c435e3b7e8987 (diff) | |
| parent | 65475f89e14cb0914db336652c345e2847c7cb92 (diff) | |
| download | system_core-ee3420bc124613827af474684c3015d12742c70d.tar.gz system_core-ee3420bc124613827af474684c3015d12742c70d.tar.bz2 system_core-ee3420bc124613827af474684c3015d12742c70d.zip | |
resolved conflicts for merge of 65475f89 to honeycomb-plus-aosp
Change-Id: I9f77e84d887dbe84bb94de0fdd369d8de24fbec3
| -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 1db80656..f23c2352 100644 --- a/include/private/android_filesystem_config.h +++ b/include/private/android_filesystem_config.h @@ -55,9 +55,10 @@ #define AID_DRM 1019 /* DRM server */ #define AID_AVAILABLE 1020 /* available for use */ #define AID_GPS 1021 /* GPS daemon */ -#define AID_NFC 1022 /* nfc subsystem */ +#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_SHELL 2000 /* adb and debug shell user */ #define AID_CACHE 2001 /* cache access */ |