Merge "Update subtitle for apps in battery settings" into oc-dev am: 031b90541f

author jackqdyulei <jackqdyulei@google.com>

Fri, 9 Jun 2017 03:00:16 +0000 (03:00 +0000)

committer android-build-merger <android-build-merger@google.com>

Fri, 9 Jun 2017 03:00:16 +0000 (03:00 +0000)
author jackqdyulei <jackqdyulei@google.com>
Fri, 9 Jun 2017 03:00:16 +0000 (03:00 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 9 Jun 2017 03:00:16 +0000 (03:00 +0000)
diff --cc src/com/android/settings/fuelgauge/PowerUsageSummary.java
Simple merge
diff --cc tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
Simple merge
author	jackqdyulei <jackqdyulei@google.com>
	Fri, 9 Jun 2017 03:00:16 +0000 (03:00 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 9 Jun 2017 03:00:16 +0000 (03:00 +0000)
		1	2
src/com/android/settings/fuelgauge/PowerUsageSummary.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java	patch \|	diff1 \|	diff2 \|	blob \| history