commit | 38db07426c4fcd93d588be90f5030db8da1980fa | [log] [tgz] |
---|---|---|
author | Andrew Sapperstein <asapperstein@google.com> | Thu Jan 05 05:06:04 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jan 05 05:06:04 2017 +0000 |
tree | a0038cef272841b09cc8be7f15ba64de08c0d1e1 | |
parent | ef4e0e82b76ac2609ace55dee155c3d5a1aecd3c [diff] | |
parent | 2380d8294155f95b68bf2dcf641116173da1e78c [diff] |
Merge changes from topics 'thermal-notif-3', 'thermal-notif' into nyc-mr2-dev am: 0c7631f8b0 am: 2380d82941 Change-Id: Ia6bb473054e47801ea5735b9b88237c96f609da0