| commit | 3af1fed38f128f02e7dcd70650e13f7d91493611 | [log] [tgz] |
|---|---|---|
| author | Wei Wang <wvw@google.com> | Tue Oct 09 14:36:52 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 09 14:36:52 2018 -0700 |
| tree | d254e0e55c7f166dcb08024364d9687a099fa375 | |
| parent | 535ea0d97ae542b33cd6d5d2f0460d1992d7681c [diff] | |
| parent | 17ac0c817c668f4be83a0c6010598ecd45b13454 [diff] |
Merge "init: increase thermal shutdown timeout to 3s" am: ed6f596de2 am: ac6bfc92a9 am: 5df9f36c2a Change-Id: I2b2dada4f8499bcf0570c81e1f1a30a27aadb5d4