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:
52c8620
81f66ce
)
Merge "Zygote: Increase wrap-pid timeout to thirty seconds"
author
Andreas Gampe
<agampe@google.com>
Tue, 25 Jul 2017 00:18:19 +0000
(
00:18
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 25 Jul 2017 00:18:19 +0000
(
00:18
+0000)
am:
81f66ce5ab
Change-Id: I1cc8856ebb68ee83a8d3e62d86b48d497d0eb237
1
2
core/java/com/android/internal/os/ZygoteConnection.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/Watchdog.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/com/android/internal/os/ZygoteConnection.java
Simple merge
diff --cc
services/core/java/com/android/server/Watchdog.java
Simple merge