OSDN Git Service

Merge "Zygote: Increase wrap-pid timeout to thirty seconds"
authorAndreas Gampe <agampe@google.com>
Tue, 25 Jul 2017 00:18:19 +0000 (00:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Jul 2017 00:18:19 +0000 (00:18 +0000)
commitd795bbcdcc595d44106e950cd6b2dd01245ca3bb
tree6edaccafc6d45605ad9b6452ef5fb34822791f78
parent52c8620c1945de45f22c1e62dcb69ddadca07675
parent81f66ce5ab477f5d1f314c653ac68c365dbe0be5
Merge "Zygote: Increase wrap-pid timeout to thirty seconds"
am: 81f66ce5ab

Change-Id: I1cc8856ebb68ee83a8d3e62d86b48d497d0eb237
core/java/com/android/internal/os/ZygoteConnection.java
services/core/java/com/android/server/Watchdog.java