| commit | 61491cc647f69813177a027480287ebb3616518b | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Jul 25 00:39:13 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 25 00:39:13 2017 +0000 |
| tree | aab68f6fa0a095eb0304af6ab00c1ca83bc38215 | |
| parent | d51030d750c5e1b87852eefe6ff4a2caa460e130 [diff] | |
| parent | bac3bc121f543d33f1a5719c5ce66cb9d016ae6b [diff] |
Merge "Zygote: Increase wrap-pid timeout to thirty seconds" am: 81f66ce5ab am: d795bbcdcc am: 7729d061ff am: bac3bc121f Change-Id: I360a8d4a13d2bc02eff117f1161c48e782ef4de7