| commit | e9eceb7e96ab6652a71903ce643e981a24bee687 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Jul 20 08:47:49 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 20 08:47:49 2017 +0000 |
| tree | 9c9282cb8df9261cf9082c6195279b3d49d657c8 | |
| parent | 55f0a6468216f4ff79ec983963b56ae83692e1dd [diff] | |
| parent | 282f98bfaccb6098e0df2ea96308fcf113930d33 [diff] |
Merge "Zygote: Poll with timeout for pid" am: 89d119abe6 am: 6078facf1f am: 57ba0ddc91 am: d3e7126645 -s ours am: 282f98bfac Change-Id: I8aba0fb492531e56f647b76ba6d992bc7a127a29