| commit | 61eedd5ad6092e72b89080ca11db2ff84e01999a | [log] [tgz] |
|---|---|---|
| author | Wei Wang <wvw@google.com> | Tue Nov 06 16:21:16 2018 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 06 16:21:16 2018 -0800 |
| tree | 08ed2b7912d33a7d581618c1ed03d6ef8d691bfd | |
| parent | a4d2eb4f03a00c90e3c58f4f3e757fe7d838a848 [diff] | |
| parent | eacd0486038a19c294459017ba68045949f456e6 [diff] |
[automerger skipped] Merge "init: increase thermal shutdown timeout to 3s" into pi-dev am: b94cc00943 -s ours am: ae7bdde1dc -s ours Change-Id: I1a4943188f1c0699a0a2768f320021421cce1769