| commit | bac3bc121f543d33f1a5719c5ce66cb9d016ae6b | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Jul 25 00:32:46 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 25 00:32:46 2017 +0000 |
| tree | 1a1fa2617e238cfda334302e3625722f1aa7da8e | |
| parent | 309d2254bf99a2feb0401578a97fac678bd33309 [diff] | |
| parent | 7729d061ffd77716a2e855f908594a7ee5c1cc2d [diff] |
Merge "Zygote: Increase wrap-pid timeout to thirty seconds" am: 81f66ce5ab am: d795bbcdcc am: 7729d061ff Change-Id: I09b9eff7215bb22e831939eede7ddaa755fc4970