OSDN Git Service

Merge "Added strings for thermal shutdown warning" into oc-dev am: dc52fd3168
authorSalvador Martinez <dehboxturtle@google.com>
Thu, 13 Apr 2017 01:11:25 +0000 (01:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Apr 2017 01:11:25 +0000 (01:11 +0000)
commitfe169d9a0e8ad4c960359fc885964fc2c10be122
tree8473e39308162eaa764828ae8f5e5dc5fa713ec5
parent23e60637ea21ebe2501e72d818ce11e9bbd8b2c9
parent37393f92f3f1941335af40ec0f8e190038600a3b
Merge "Added strings for thermal shutdown warning" into oc-dev am: dc52fd3168
am: 37393f92f3

Change-Id: I1e0c5aa83f7e12a864c607264957a7a985251866