| commit | 6c870fe50ebd48afd0f88290c9c7c5fd54938758 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Sat Sep 30 01:15:21 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Sep 30 01:15:21 2017 +0000 |
| tree | 06100c70eeadc5863822c8a454efbc21be3140b3 | |
| parent | 43a5621ba29362fc0ace8cbf534697c4936acdb4 [diff] | |
| parent | 6f0b3390ef0e8289366fc1817f754c67532cf98b [diff] |
Merge "reboot: only pause indefinitely for non-shutdown operations" am: e808f9213c am: 2e12030ca5 am: 31b57d00d7 Change-Id: I1c3bc1f6a443cc1ccad87616778c716508d63129