diff options
author | Josh Gao <jmgao@google.com> | 2017-02-06 18:37:54 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-02-06 18:37:55 +0000 |
commit | 0784e511634963b940ff4adeeae578e22d6ab664 (patch) | |
tree | 8db79d3caf42bc3a2582b7c99e01ab7ce67cbae1 /tools/aapt2/diff/Diff.cpp | |
parent | ff1d8da55ed4dc7e646c970a401c869a47fc39e0 (diff) | |
parent | 45dab78e989a8e3f3cabb71ebc753e5a8fdcbcd6 (diff) |
Merge changes from topic 'debuggerd_ambient'
* changes:
zygote: make all capabilities inheritable.
Revert "zygote: don't drop CAP_SYS_PTRACE from the bounding set."
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions