OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4dc7830
dec6886
)
Merge "Reland: Move zygote's seccomp setup to post-fork" am: 7839672e22 am: 4249466562
author
Victor Hsieh
<victorhsieh@google.com>
Thu, 18 Jan 2018 01:31:09 +0000
(
01:31
+0000)
committer
android-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
patch
|
diff1
|
diff2
|
blob
|
history
core/java/com/android/internal/os/ZygoteInit.java
patch
|
diff1
|
diff2
|
blob
|
history
core/jni/Android.bp
patch
|
diff1
|
diff2
|
blob
|
history
core/jni/AndroidRuntime.cpp
patch
|
diff1
|
diff2
|
blob
|
history
core/jni/com_android_internal_os_Zygote.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/com/android/internal/os/Zygote.java
Simple merge
diff --cc
core/java/com/android/internal/os/ZygoteInit.java
Simple merge
diff --cc
core/jni/Android.bp
Simple merge
diff --cc
core/jni/AndroidRuntime.cpp
Simple merge
diff --cc
core/jni/com_android_internal_os_Zygote.cpp
Simple merge