tree 6294f4189ba7041bad987fdc82aca11696615197
parent a7f99efdb2e8ae1360b19f0889a20c66136898b9
parent 509b97b97358ceebfc2076fdb872fef84575010a
author Maggie White <maggiewhite@google.com> 1555442585 -0700
committer android-build-merger <android-build-merger@google.com> 1555442585 -0700

Merge "thermal: Add pulled cooling device atom and a field to Temperature atom" into qt-dev
am: 509b97b973

Change-Id: I70588e10f0a96bbdfa9f2b102122d10393f40d02