OSDN Git Service

Merge "Shorten main settings battery string" into oc-mr1-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 1 Aug 2017 19:45:59 +0000 (19:45 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 1 Aug 2017 19:45:59 +0000 (19:45 +0000)

Trivial merge