| commit | 7729d061ffd77716a2e855f908594a7ee5c1cc2d | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Jul 25 00:27:45 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 25 00:27:45 2017 +0000 |
| tree | d55a1382094f52e3bdc0579c27b40f6ef6a85ac4 | |
| parent | 51b9a824d5f9553bd6767119827ee3bff49d290b [diff] | |
| parent | d795bbcdcc595d44106e950cd6b2dd01245ca3bb [diff] |
Merge "Zygote: Increase wrap-pid timeout to thirty seconds" am: 81f66ce5ab am: d795bbcdcc Change-Id: I350d479d030e3b8398975f60b8463343f7bb5e86