OSDN Git Service

Merge "Shorten main settings battery string" into oc-mr1-dev am: 4e963f8f91
authorSalvador Martinez <dehboxturtle@google.com>
Tue, 1 Aug 2017 20:15:41 +0000 (20:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Aug 2017 20:15:41 +0000 (20:15 +0000)
am: 6db99201aa

Change-Id: I82bf5cfe72cfd8ec774c6c7d21c17bd946163903


Trivial merge