OSDN Git Service

Merge changes I573e4fb9,I8e7baadc into oc-dev am: 67e38774ce
authorLei Yu <jackqdyulei@google.com>
Thu, 18 May 2017 17:12:34 +0000 (17:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 May 2017 17:12:34 +0000 (17:12 +0000)
commit9a4be81e5cda5a7eb424b6e4489cc545cae73247
treee811e49a6e6025ea06a026338a08f1af8088669e
parent821c83e749668b00e2760f6fd2eac289cb8912c4
parentd85bdebe0e9a8e67636183884af2a25e7f01158c
Merge changes I573e4fb9,I8e7baadc into oc-dev am: 67e38774ce
am: d85bdebe0e

Change-Id: I865f41eae196aee32edd60169dacbc5dca772439
src/com/android/settings/fuelgauge/PowerUsageSummary.java
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java