OSDN Git Service

Merge "Reland: Move zygote's seccomp setup to post-fork" am: 7839672e22 am: 4249466562
authorVictor Hsieh <victorhsieh@google.com>
Thu, 18 Jan 2018 01:31:09 +0000 (01:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 Jan 2018 01:31:09 +0000 (01:31 +0000)
am: dec688691d

Change-Id: Ibcf5eeef74b69112f568ebb1f146c2990ffed30a

1  2 
core/java/com/android/internal/os/Zygote.java
core/java/com/android/internal/os/ZygoteInit.java
core/jni/Android.bp
core/jni/AndroidRuntime.cpp
core/jni/com_android_internal_os_Zygote.cpp

Simple merge
Simple merge