| commit | 6e3b79f09ab5c30a573ed09e6e82fb26230dff31 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Sat Sep 30 01:20:19 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Sep 30 01:20:19 2017 +0000 |
| tree | 33a32d4bba067641c64ed0c65608eebf83c4bb1e | |
| parent | 4dfe0c0e53144ad75f4cbb0cb4111a73f84ffc8f [diff] | |
| parent | 6c870fe50ebd48afd0f88290c9c7c5fd54938758 [diff] |
Merge "reboot: only pause indefinitely for non-shutdown operations" am: e808f9213c am: 2e12030ca5 am: 31b57d00d7 am: 840b7d1fd6 Change-Id: I5f3f4bafd98a6bea3c36a027de3ec76510f26631