Merge commit '015897709182be40eb5e9aee19e9ef396738a33e' * commit '015897709182be40eb5e9aee19e9ef396738a33e': Add support for running apps with uid/gid AID_LOG by specifying android.uid.log in the manifest
Merge commit '015897709182be40eb5e9aee19e9ef396738a33e' * commit '015897709182be40eb5e9aee19e9ef396738a33e': Add support for running apps with uid/gid AID_LOG by specifying android.uid.log in the manifest