Merge "Add log for battery tip action." into pi-dev

author TreeHugger Robot <treehugger-gerrit@google.com>

Tue, 20 Mar 2018 21:11:41 +0000 (21:11 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 20 Mar 2018 21:11:41 +0000 (21:11 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Tue, 20 Mar 2018 21:11:41 +0000 (21:11 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 20 Mar 2018 21:11:41 +0000 (21:11 +0000)
diff --cc src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
Simple merge
diff --cc tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
Simple merge
diff --cc tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Tue, 20 Mar 2018 21:11:41 +0000 (21:11 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 20 Mar 2018 21:11:41 +0000 (21:11 +0000)
		1	2
src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java	patch \|	diff1 \|	diff2 \|	blob \| history