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:
88698af
966619d
)
system_server: add CAP_SYS_PTRACE
author
Nick Kralevich
<nnk@google.com>
Mon, 22 May 2017 22:04:57 +0000
(22:04 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 22 May 2017 22:04:57 +0000
(22:04 +0000)
am:
966619d0ab
Change-Id: Ie5f95f2c078cd0bec7a2b2321c3303301ec9ec74
1
2
core/java/com/android/internal/os/ZygoteInit.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/com/android/internal/os/ZygoteInit.java
Simple merge