commit 7e070eb29f872426d74838abeff8f1c7947f5e6e
author Jorge Lucangeli Obes <jorgelo@google.com> Sat Feb 27 00:53:26 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Feb 27 00:53:26 2016 +0000
tree 80c84e2120cb0718e7d675101a560ea719a6825b
parent 40d9046e4e6f592fb68bd40263e4534667ade5f7
parent da6b7ef1e9585a2a2cc62d3e64f537e477b226d5

Merge "Add notice for adding users in AOSP." am: acf69772ff
am: da6b7ef1e9

* commit 'da6b7ef1e9585a2a2cc62d3e64f537e477b226d5':
  Add notice for adding users in AOSP.

include/private/android_filesystem_config.h

diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index 6232f72..53966d5 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -91,6 +91,7 @@
 #define AID_CAMERASERVER  1047  /* cameraserver process */
 #define AID_FIREWALL      1048  /* firewalld process */
 #define AID_TRUNKS        1049  /* trunksd process (TPM daemon) */
+/* Changes to this file must be made in AOSP, *not* in internal branches. */
 
 #define AID_SHELL         2000  /* adb and debug shell user */
 #define AID_CACHE         2001  /* cache access */