| commit | 9766c9ff31b374edbe43c7917b38a7630fd39a7d | [log] [tgz] |
|---|---|---|
| author | Keun-young Park <keunyoung@google.com> | Wed Mar 22 20:20:58 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Mar 22 20:20:58 2017 +0000 |
| tree | 4e8bbc4db44346a85bac419f00da5e502e7fd15c | |
| parent | 3286d2d0d22ebdf92db92980a3cadcd14b84d1ed [diff] | |
| parent | f803be004acbcdfe93a31a631fd6dd0a35f23195 [diff] |
Merge "remove emergency shutdown and improve init's reboot logic" am: 437dc91fa3 am: f803be004a Change-Id: I8ce4ca89034b214cf867fc4b8cd2721aae4fba17