OSDN Git Service

Merge changes Ie7c3cd59,Ieed87d17
authorTreeHugger Robot <treehugger-gerrit@google.com>
Sat, 25 Mar 2017 01:15:45 +0000 (01:15 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 25 Mar 2017 01:15:46 +0000 (01:15 +0000)
commitcb25394618ea31c38bd7e387c2edd1e48d60e8dc
tree0f25049b617e03f8163181d7836e5aec9fa51091
parent1783e0020bd64d09e6c734b8f6f5766773894e6e
parent5776507642c17b2a7522f85912e9c1ffb7b03417
Merge changes Ie7c3cd59,Ieed87d17

* changes:
  Update the battery string based on new mock.
  Update the string in battery screen
res/values/strings.xml