commit | eacd0486038a19c294459017ba68045949f456e6 | [log] [tgz] |
---|---|---|
author | Wei Wang <wvw@google.com> | Tue Nov 06 16:14:50 2018 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Tue Nov 06 16:14:50 2018 -0800 |
tree | a3eb486c62ec4e2de458321d75150c4d08289cf2 | |
parent | 221cda486309c0d8f97e31d6b21503b8f4758616 [diff] | |
parent | 2691c60accff73127f695a3ad45a9edd136e8dd5 [diff] |
[automerger skipped] Merge "init: increase thermal shutdown timeout to 3s" into pi-dev am: b94cc00943 -s ours Change-Id: I84f134ab2f337bf33af23dc4345a8653f5422cd1