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)
commit2380d8294155f95b68bf2dcf641116173da1e78c
treea17733764c1bad29803e686624e91b293c19e3b1
parentb54a7924299f818850586f34ad8f1ad08e10ddfb
parent0c7631f8b099b0be785c75c2b5d13d5579fad200
Merge changes from topics 'thermal-notif-3', 'thermal-notif' into nyc-mr2-dev
am: 0c7631f8b0

Change-Id: Ia9a3f2789fd4ec13578790e8afd557198b393809