| commit | d795bbcdcc595d44106e950cd6b2dd01245ca3bb | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Jul 25 00:18:19 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 25 00:18:19 2017 +0000 |
| tree | 6edaccafc6d45605ad9b6452ef5fb34822791f78 | |
| parent | 52c8620c1945de45f22c1e62dcb69ddadca07675 [diff] | |
| parent | 81f66ce5ab477f5d1f314c653ac68c365dbe0be5 [diff] |
Merge "Zygote: Increase wrap-pid timeout to thirty seconds" am: 81f66ce5ab Change-Id: I1cc8856ebb68ee83a8d3e62d86b48d497d0eb237