| commit | b41b258ff1a3a4a62d70e97cd431bfe616bb713b | [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 | 2afc9ed54fa8cddd4b550589307857bad406a961 [diff] | |
| parent | 25a67c4eb0452770df2781fd4a5fd28e314fe1e4 [diff] |
Merge "remove emergency shutdown and improve init's reboot logic" am: 437dc91fa3 am: f803be004a Change-Id: I8ce4ca89034b214cf867fc4b8cd2721aae4fba17