| commit | fe169d9a0e8ad4c960359fc885964fc2c10be122 | [log] [tgz] |
|---|---|---|
| author | Salvador Martinez <dehboxturtle@google.com> | Thu Apr 13 01:11:25 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 13 01:11:25 2017 +0000 |
| tree | 8473e39308162eaa764828ae8f5e5dc5fa713ec5 | |
| parent | 23e60637ea21ebe2501e72d818ce11e9bbd8b2c9 [diff] | |
| parent | 37393f92f3f1941335af40ec0f8e190038600a3b [diff] |
Merge "Added strings for thermal shutdown warning" into oc-dev am: dc52fd3168 am: 37393f92f3 Change-Id: I1e0c5aa83f7e12a864c607264957a7a985251866