OSDN Git Service

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

Change-Id: I6d0a0c6dc87bac1470eb4cfccee61c878bed9ee3


Trivial merge