Merge "Use default package in BatteryEntry" into oc-dev am: f5f51c4cf2

author jackqdyulei <jackqdyulei@google.com>

Thu, 8 Jun 2017 02:16:20 +0000 (02:16 +0000)

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

Thu, 8 Jun 2017 02:16:20 +0000 (02:16 +0000)
author jackqdyulei <jackqdyulei@google.com>
Thu, 8 Jun 2017 02:16:20 +0000 (02:16 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 02:16:20 +0000 (02:16 +0000)
diff --cc src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
Simple merge
diff --cc tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
Simple merge
author	jackqdyulei <jackqdyulei@google.com>
	Thu, 8 Jun 2017 02:16:20 +0000 (02:16 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 8 Jun 2017 02:16:20 +0000 (02:16 +0000)
		1	2
src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java	patch \|	diff1 \|	diff2 \|	blob \| history