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:
8ad84c5
140b9b6
)
Merge "Zygote: Add fdsToIgnore" am: 5b22a826d5
author
Andreas Gampe
<agampe@google.com>
Wed, 11 Jan 2017 02:46:57 +0000
(
02:46
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 11 Jan 2017 02:46:57 +0000
(
02:46
+0000)
am:
140b9b65a1
Change-Id: Ib4c46887ed5d87ef143bd866320d77b75d8711a3
1
2
core/jni/com_android_internal_os_Zygote.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/jni/com_android_internal_os_Zygote.cpp
Simple merge