commit | d7200d2fdf33f7eba8fab1a816b8617b37a4cf5f | [log] [tgz] |
---|---|---|
author | Philip Cuadra <philipcuadra@google.com> | Fri Nov 18 21:46:30 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Nov 18 21:46:30 2016 +0000 |
tree | 959d3aaaa93280dd0f2ad5a036c6cf5a59dfe874 | |
parent | edceca6dfe4e75b6912cff0c845cae8e8d8c92d8 [diff] | |
parent | aa68df5e914f447b4ea13607e297a286bfc2fb91 [diff] |
Merge "Add a thermal shutdown to marlin" into nyc-dr1-dev am: aa68df5e91 Change-Id: Ic09833e08d99f5a5d5fb61cfa6d865848255062d