OSDN Git Service

Merge "Added dialog to notify user of thermal shutdown" into oc-dev
authorSalvador Martinez <dehboxturtle@google.com>
Mon, 1 May 2017 16:55:44 +0000 (16:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 May 2017 16:55:44 +0000 (16:55 +0000)
am: 4d09adcef1

Change-Id: Ic53481e2aa95146bc33c21174b1a50f62bdc8851


Trivial merge