OSDN Git Service

Merge changes from topic 'battery_smear_move' into oc-dev am: 883db32859
authorLei Yu <jackqdyulei@google.com>
Fri, 9 Jun 2017 22:08:39 +0000 (22:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Jun 2017 22:08:39 +0000 (22:08 +0000)
am: 308d0dd03c

Change-Id: Ifa87d06d51598b005a6f51d2bf3a2ac936848d6e


Trivial merge