| commit | 3c4e77230f546f93b8442141664f606f0152c5e2 | [log] [tgz] |
|---|---|---|
| author | Wei Wang <wvw@google.com> | Tue Oct 09 14:24:33 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 09 14:24:33 2018 -0700 |
| tree | 3deb71d3a7d04887aee3caf39570597a13adc968 | |
| parent | 5b4e13e9b18d7c365fec9fea8efbe7ecd34b9c0e [diff] | |
| parent | 30e8567d462245d35e214794603b88fb712ddb25 [diff] |
Merge "init: increase thermal shutdown timeout to 3s" am: ed6f596de2 Change-Id: I13a1d33b5c6cc0e55a42b75ec52e9289d1e5d512