tree b58de1718bcf9c7b611ed651433828958936330c
parent f77f2cb3e79cfbe1ff57ad7fdcb4da3ec39c6ed4
parent 273b886c49c3b8a4b73127fcadc4303e89bfc04a
author Josh Gao <jmgao@google.com> 1485379289 +0000
committer android-build-merger <android-build-merger@google.com> 1485379289 +0000

Merge "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
am: 273b886c49

Change-Id: I82c58cd03c8db78a1733ba5070d314607475cee7