tree 2b2015215edeac3f41a5c058da697410bc7c3f41
parent 5ec12126f0ce341d97076f8f907d280148fbfc31
parent 1d7e500bfcd74d66a6bbc1fb81787b228765f99a
author Tianjie Xu <xunchang@google.com> 1490736847 +0000
committer android-build-merger <android-build-merger@google.com> 1490736847 +0000

Merge "Log temperature during OTA update" am: bc2c51a97f
am: 1d7e500bfc

Change-Id: I44a64b7cf0054fcc4cea9b6124c3f6a089f268e1