OSDN Git Service

Merge "Merge "Report the temperature during an OTA update" am: 47c7e7f41a am: 022682a...
authorTianjie Xu <xunchang@google.com>
Thu, 30 Mar 2017 18:32:06 +0000 (18:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Mar 2017 18:32:06 +0000 (18:32 +0000)
am: 217ecd0729

Change-Id: Ic6365155a6958f758031a4156c03d5ba4d56ff11


Trivial merge