| commit | 5df9f36c2aaf51bf64ac6344205909efb978855a | [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 | f17a9e2b26bd55b28b462190e8f29c497d5b87f5 [diff] | |
| parent | ac6bfc92a9577800daabe3a06348a770bedaa850 [diff] |
Merge "init: increase thermal shutdown timeout to 3s" am: ed6f596de2 am: ac6bfc92a9 Change-Id: I77fe4111e5775eb56b4158beb6705903dbb0ae63