OSDN Git Service

Merge "Added strings for thermal shutdown warning" into oc-dev
authorSalvador Martinez <dehboxturtle@google.com>
Thu, 13 Apr 2017 01:01:35 +0000 (01:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Apr 2017 01:01:35 +0000 (01:01 +0000)
commit37393f92f3f1941335af40ec0f8e190038600a3b
tree92854f664236b9afd756f292ec82be91e53e4cd8
parent651a2970e62c95489c300609a1635d71103a4383
parentdc52fd316802316d65174feebb5e210b7c2db7de
Merge "Added strings for thermal shutdown warning" into oc-dev
am: dc52fd3168

Change-Id: I6395ad5cb79712e6cb00bcc4996fecda6018b919