Merge "Remove the old battery page" into pi-dev

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

Tue, 27 Mar 2018 20:23:23 +0000 (20:23 +0000)

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

Tue, 27 Mar 2018 20:23:23 +0000 (20:23 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Tue, 27 Mar 2018 20:23:23 +0000 (20:23 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 27 Mar 2018 20:23:23 +0000 (20:23 +0000)
diff --cc AndroidManifest.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Tue, 27 Mar 2018 20:23:23 +0000 (20:23 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 27 Mar 2018 20:23:23 +0000 (20:23 +0000)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history