tree 37efdc7e0a7a4f8b4bf7e8669ff468c0fe360895
parent afb3a15f39e73978c071a58d3466993293c6d3b1
parent 98a6ae31e5de97b38d9cd68ab4c9fda01f12b710
author TreeHugger Robot <treehugger-gerrit@google.com> 1541548884 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1541548884 +0000

Merge "init: increase thermal shutdown timeout to 3s" into pi-dev