| commit | 36d8b489d2da7208ddee3248a4e02b0e58fb4cd4 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Jul 25 18:09:42 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jul 25 18:09:42 2017 +0000 |
| tree | 697fac006f03b822e211d00dc937c64f65cb9ce2 | |
| parent | 3072aa76c9ee475bdc76d16987855a7b7feffff6 [diff] | |
| parent | 032a9295429f1bedf3c147e5757e741bc7f62886 [diff] |
Merge "Zygote: Increase wrap-pid timeout to thirty seconds" into oc-mr1-dev