commit fb66a101aef83ff9b9b8e6e02e9588eadfd00d98
author Jorge Lucangeli Obes <jorgelo@google.com> Wed Feb 24 13:07:32 2016 -0800
committer Jorge Lucangeli Obes <jorgelo@google.com> Wed Feb 24 13:07:32 2016 -0800
tree 01e3ae8cbf5a8fcb7f331a6cd06abe90b2adc11c
parent 0840b2246a001d3e9f8f795c01144b59cf404826
parent 57627d0e47afd779b736fe402fb33a8c3fe93a72

Resolve merge conflicts of c5972cda6c to stage-aosp-master.

Change-Id: I3ab7810e047d128a4ac088eda857c3842f2d6de8

include/private/android_filesystem_config.h

diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index 85d6c19..c220a0c 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -88,6 +88,7 @@
 #define AID_WEBSERV       1044  /* webservd process */
 #define AID_DEBUGGERD     1045  /* debuggerd unprivileged user */
 #define AID_MEDIA_CODEC   1046  /* mediacodec process */
+#define AID_CAMERASERVER  1047  /* cameraserver process */
 
 #define AID_SHELL         2000  /* adb and debug shell user */
 #define AID_CACHE         2001  /* cache access */
@@ -194,6 +195,7 @@
     { "webserv",       AID_WEBSERV },
     { "debuggerd",     AID_DEBUGGERD, },
     { "mediacodec",    AID_MEDIA_CODEC, },
+    { "cameraserver",  AID_CAMERASERVER, },
 
     { "shell",         AID_SHELL, },
     { "cache",         AID_CACHE, },