| commit | 282f98bfaccb6098e0df2ea96308fcf113930d33 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Jul 20 08:36:57 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 20 08:36:57 2017 +0000 |
| tree | 749fffd48485b52b824121641117a9013e778a99 | |
| parent | de7e5a55955dbbd203847e7275623016b066519f [diff] | |
| parent | d3e7126645ecefc95ee438a0caffc35711ade05d [diff] |
Merge "Zygote: Poll with timeout for pid" am: 89d119abe6 am: 6078facf1f am: 57ba0ddc91 am: d3e7126645 -s ours Change-Id: I92025790fe2d6d9db9f57f51c31d5ddc5c022034