| commit | 6f0b3390ef0e8289366fc1817f754c67532cf98b | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Fri Sep 29 21:03:56 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 29 21:03:56 2017 +0000 |
| tree | 3708805b204b8a9c2f828f91bd3691be27d9a3b0 | |
| parent | e24b0776a84621a50159e95ab2078f83e21a15a4 [diff] | |
| parent | 5ddd12e1f511280b2a25c0e70dd3b829355c6765 [diff] |
Merge "reboot: only pause indefinitely for non-shutdown operations" am: e808f9213c am: 2e12030ca5 Change-Id: Ib39292538c623c64fbb624e8291dddf5e1aa1f11