tree bdd0c04e7762242e1c05efc9ccdc313a01fd03bc
parent 39958cb6e8c46ce58d3932e25f8f18e13142066d
parent 9766c9ff31b374edbe43c7917b38a7630fd39a7d
author Keun-young Park <keunyoung@google.com> 1490214214 +0000
committer android-build-merger <android-build-merger@google.com> 1490214214 +0000

Merge "remove emergency shutdown and improve init's reboot logic" am: 437dc91fa3 am: f803be004a
am: 9766c9ff31

Change-Id: Ifeb00b8356272e831a167e3cc7ebba30bf7134f8