commit 3544e33247fb66de561f8007f553f99c6e087f54
author Nick Pelly <npelly@google.com> Mon Nov 21 21:08:24 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 21 21:08:24 2011 -0800
tree bd1b5e7e8778fc1601e29b9c514c2e27f11b350b
parent de8b136d5a1bcb5decf0dd00edcd6c9e70b4f882
parent 3d547e0dda7ad58108a219c7ef20bab426d5ea38

am 3d547e0d: am f9c1fcc5: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1

* commit '3d547e0dda7ad58108a219c7ef20bab426d5ea38':
  Replace vendor specific NfcGoogle.apk with generic Nfc.apk

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