OSDN Git Service

Merge "Shorten main settings battery string" into oc-mr1-dev
authorSalvador Martinez <dehboxturtle@google.com>
Tue, 1 Aug 2017 20:01:13 +0000 (20:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Aug 2017 20:01:13 +0000 (20:01 +0000)
commit6db99201aacebb4bccd72379a5ad2f646f26a8ac
tree5ff42080d766483cb3e9f0dc7160e0ff1c2f36e5
parentbbd92b5748f4d19a80493071a399401fb5b18e48
parent4e963f8f91c4a992ac4e904fe280cc9cd4dee482
Merge "Shorten main settings battery string" into oc-mr1-dev
am: 4e963f8f91

Change-Id: I00e0b8126679815d460336d1cc2b01fc5abf55bd