tree 8e4cffa452730d976c1267612d3d64f4f6735640
parent 472010f5f61be5f09439b62f30f006150dd9c9b7
parent 406a3e842c751324a2b58e750d066ff461c7a9aa
author Tom Cherry <tomcherry@google.com> 1519668669 +0000
committer android-build-merger <android-build-merger@google.com> 1519668669 +0000

Merge "init: Reboot after timeout passes during reboot" am: 89063827b1 am: d59fed22c5
am: 406a3e842c

Change-Id: I0bba457256f44597d76c12a2bee132e083cecbb3