commit | 5ddd12e1f511280b2a25c0e70dd3b829355c6765 | [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 | 9f272c95ba90418ab3ee81899692c52d229d135e [diff] | |
parent | 2a228a7fcd83d962331d6c21998028629c9a71ed [diff] |
Merge "reboot: only pause indefinitely for non-shutdown operations" am: e808f9213c Change-Id: I8386ad08ff53f94b78bae713f614f962a92637d2