| commit | 2e12030ca532a71fe20b35233462a0dbb51164ee | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Fri Sep 29 21:02:36 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 29 21:02:36 2017 +0000 |
| tree | f680036d8a31252664c23a0c522b1e9aa8e6dc60 | |
| parent | bc3d3625d5646ecb7de9291bdaba36b1fed1e2ef [diff] | |
| parent | e808f9213ce8f256d3b90225f7c69648a6faf238 [diff] |
Merge "reboot: only pause indefinitely for non-shutdown operations" am: e808f9213c Change-Id: I8386ad08ff53f94b78bae713f614f962a92637d2