OSDN Git Service

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

Change-Id: I83e8bb805ab7d73f63136133a291ecfeb6d762db