Merge "Add help uri for smart battery page" into pi-dev am: 64135745b9

author Lei Yu <jackqdyulei@google.com>

Fri, 11 May 2018 01:14:00 +0000 (18:14 -0700)

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

Fri, 11 May 2018 01:14:00 +0000 (18:14 -0700)
author Lei Yu <jackqdyulei@google.com>
Fri, 11 May 2018 01:14:00 +0000 (18:14 -0700)
committer android-build-merger <android-build-merger@google.com>
Fri, 11 May 2018 01:14:00 +0000 (18:14 -0700)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/fuelgauge/SmartBatterySettings.java
Simple merge
author	Lei Yu <jackqdyulei@google.com>
	Fri, 11 May 2018 01:14:00 +0000 (18:14 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 11 May 2018 01:14:00 +0000 (18:14 -0700)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/fuelgauge/SmartBatterySettings.java	patch \|	diff1 \|	diff2 \|	blob \| history