OSDN Git Service

Merge "Add BatteryInfo logging to settings" into oc-dr1-dev am: 9a3b115cc8
authorSalvador Martinez <dehboxturtle@google.com>
Fri, 30 Jun 2017 22:16:47 +0000 (22:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Jun 2017 22:16:47 +0000 (22:16 +0000)
am: 97642af54d

Change-Id: Id4f7032e735067ab9a81476e83003c942eb4f826


Trivial merge