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)
commitfec50f4248d3344a858265a5dde41739eec66938
tree8a3e6c782c03fc01768d7427eb23f45e2ed9a23d
parent16e0ef2b7d7108913ed44a4b7092d4e2867a387e
parent6db99201aacebb4bccd72379a5ad2f646f26a8ac
Merge "Shorten main settings battery string" into oc-mr1-dev am: 4e963f8f91
am: 6db99201aa

Change-Id: I82bf5cfe72cfd8ec774c6c7d21c17bd946163903