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:
9e73672
c6f0b54
)
am c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev
author
Benoit Goby
<benoit@android.com>
Mon, 10 Mar 2014 19:02:54 +0000
(19:02 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 10 Mar 2014 19:02:54 +0000
(19:02 +0000)
* commit '
c6f0b54d695b49966a13bb196800a985ac6ce212
':
Add CAP_BLOCK_SUSPEND to system server
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