commit 999a1931816495863c5749805e98fd15925c605a
author The Android Automerger <android-build@android.com> Mon Nov 28 12:23:45 2011 -0800
committer The Android Automerger <android-build@android.com> Mon Nov 28 12:23:45 2011 -0800
tree 5cd123fcb7eddc00e68df70a3296b418d1bb1fb7
parent f9c1fcc505d59fd87392e6af7341b1737f186081
parent a9856519679790acd7b4ae9aac57a01e07c77bac

merge in ics-mr1-release history after reset to ics-mr1

include/private/android_filesystem_config.h

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 */