resolved conflicts for merge of 65475f89 to honeycomb-plus-aosp

Change-Id: I9f77e84d887dbe84bb94de0fdd369d8de24fbec3
2011-04-05 12:32:50 -05:00 · 2011-04-05 12:32:50 -05:00 · ee3420bc12
parent b6623abc41 65475f89e1
commit ee3420bc12
1 changed files with 2 additions and 1 deletions
--- 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 */