| commit | 7d670d8a2187060e8a6b593f4599bf4004835ead | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Tue Mar 20 13:55:19 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Mar 20 13:55:19 2018 +0000 |
| tree | 36f6d7a72b9adc7a9a43929f0bc02225ed3f345d | |
| parent | e36597f23c1f5e4669ba4f462a102cbbce9ab625 [diff] | |
| parent | 029498be312de126056c85bcd60e5713c5bcca05 [diff] |
Merge "Revert "init: Reboot after timeout passes during reboot"" am: 92d55b6c07 am: e48dfe91ca Change-Id: Ibf0db3721894cf78ba3f67b1e364833ffe1a9b82