tree aab58851a47f3a588385330dd3f85f08e1bf0ff7
parent 2eb5d108466124272a5cb7c3753d382e5c7b59a5
parent 6ccd0b780fe0953bcea4c538fe2c0a1f2b9f5af2
author Tianjie Xu <xunchang@google.com> 1490737464 +0000
committer android-build-merger <android-build-merger@google.com> 1490737464 +0000

Merge "Log temperature during OTA update" am: bc2c51a97f am: 1d7e500bfc am: 556ca4e301
am: 6ccd0b780f

Change-Id: I506216f819950295d50a7d0d0310f7d537d59b60