| commit | 53cf7f2bd89bd3bcdc1d3444c7d34c799e617d32 | [log] [tgz] |
|---|---|---|
| author | android-build-team Robot <android-build-team-robot@google.com> | Wed May 31 18:33:56 2017 +0000 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Wed May 31 18:33:56 2017 +0000 |
| tree | a7eb22a7a4665ae722a26d3c46b330202b6a1e27 | |
| parent | 513ef16a59313ee7f98718bfdaca23fc44cf3c4f [diff] | |
| parent | be40c364ab6093c9a8c3a87adb839badf85a3f74 [diff] |
Merge cherrypicks of [2337578, 2337519] into nyc-mr1-volantis-release Change-Id: I22f480767c9ca79bae703a24455b3c494115304b
diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index ac742a0..e6a20a4 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -642,7 +642,6 @@ OsConstants.CAP_SYS_MODULE, OsConstants.CAP_SYS_NICE, OsConstants.CAP_SYS_PTRACE, - OsConstants.CAP_SYS_RESOURCE, OsConstants.CAP_SYS_TIME, OsConstants.CAP_SYS_TTY_CONFIG );