OSDN Git Service

Merge changes from topics 'thermal-notif-3', 'thermal-notif' into nyc-mr2-dev
authorAndrew Sapperstein <asapperstein@google.com>
Thu, 5 Jan 2017 03:07:54 +0000 (03:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 5 Jan 2017 03:07:54 +0000 (03:07 +0000)
am: 0c7631f8b0

Change-Id: Ia9a3f2789fd4ec13578790e8afd557198b393809


Trivial merge