tree 18f80b011498fb6724749f54605bed41d6d4ef20
parent c6e955569c636350f82d1f3a09b666c8a69b3197
parent 217ecd0729809508c731dc5f49b437fd9681b65e
author Tianjie Xu <xunchang@google.com> 1490898726 +0000
committer android-build-merger <android-build-merger@google.com> 1490898726 +0000

Merge "Merge "Report the temperature during an OTA update" am: 47c7e7f41a am: 022682a721 am: 998c554463" into oc-dev
am: 217ecd0729

Change-Id: Ic6365155a6958f758031a4156c03d5ba4d56ff11