commit 58fa4b99ad5a2d66fbd461a03ddc0443d153296b
author Android Build Merger (Role) <android-build-merger@google.com> Tue May 23 01:47:06 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 23 01:47:09 2017 +0000
tree 6b44b6e51cf8159e7afe0372edd60b10ea8c9941
parent c70f822a455bccc863786122c25cb4e2c6565bf1
parent 0e2ec5b8575ca89240ca7e82972f4087df4343c2

Merge changes from topic 'am-3c32cf60aa7d4143a4aec89ba3f5325d' into oc-dev-plus-aosp

* changes:
  ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8 am: 8965cd6a39 am: 47beaa8fab am: 55c8a1ede9 am: 66a08a5413 am: 7a06357519 am: a07389b446 am: 5f4382e2a6 am: 3946a75cb3 am: 3c529012d3 am: ce8a0dea71 am: 87cef51e2b
  system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973 am: c46889e2d2 am: f5bd84b82d am: 982b8018af am: 7fd2d8ea31 am: 5bfe82c3ee am: 12c5f0da9f am: dc87ac995a am: 02f0044d98 am: 6cadbad153 am: fdf1fdfc1b  -s ours am: ac9121b73a