OSDN Git Service

Merge "Update battery footer text" into oc-dr1-dev am: 2c986d9b94
authorLei Yu <jackqdyulei@google.com>
Tue, 20 Jun 2017 21:26:02 +0000 (21:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Jun 2017 21:26:02 +0000 (21:26 +0000)
am: b8d9cacae5

Change-Id: I1b697d40d8fc12ba0825fed2436ac79252a2311f

1  2 
res/values/strings.xml

Simple merge