OSDN Git Service

Merge "Merge "Merge "Change default temp threshold to use shutdown temp" into oc...
authorJason Monk <jmonk@google.com>
Sat, 12 Aug 2017 03:42:09 +0000 (03:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 12 Aug 2017 03:42:09 +0000 (03:42 +0000)
am: 987fb55c2a

Change-Id: Iac7925ce9d03da038be8d7d5acc59c41134add26


Trivial merge