| commit | ac6bfc92a9577800daabe3a06348a770bedaa850 | [log] [tgz] |
|---|---|---|
| author | Wei Wang <wvw@google.com> | Tue Oct 09 14:24:33 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 09 14:24:33 2018 -0700 |
| tree | 3deb71d3a7d04887aee3caf39570597a13adc968 | |
| parent | e53b3adc8024e05514c6d8223df54073fcb44629 [diff] | |
| parent | ed6f596de277ddb988458f8b713b07cf95337157 [diff] |
Merge "init: increase thermal shutdown timeout to 3s" am: ed6f596de2 Change-Id: I13a1d33b5c6cc0e55a42b75ec52e9289d1e5d512