| commit | 17ac0c817c668f4be83a0c6010598ecd45b13454 | [log] [tgz] |
|---|---|---|
| author | Wei Wang <wvw@google.com> | Tue Oct 09 14:29:14 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 09 14:29:14 2018 -0700 |
| tree | 8b58d53932296413cf76753b46386e69633eb2e1 | |
| parent | c64b37a4754dfce9969b71afb55ec22527ba69eb [diff] | |
| parent | 3c4e77230f546f93b8442141664f606f0152c5e2 [diff] |
Merge "init: increase thermal shutdown timeout to 3s" am: ed6f596de2 am: ac6bfc92a9 Change-Id: I77fe4111e5775eb56b4158beb6705903dbb0ae63