Merge "Move some battery stuff to SettingsLib"

author Jason Monk <jmonk@google.com>

Mon, 11 Jan 2016 19:30:24 +0000 (19:30 +0000)

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

Mon, 11 Jan 2016 19:30:24 +0000 (19:30 +0000)
author Jason Monk <jmonk@google.com>
Mon, 11 Jan 2016 19:30:24 +0000 (19:30 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 11 Jan 2016 19:30:24 +0000 (19:30 +0000)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/Utils.java
Simple merge
author	Jason Monk <jmonk@google.com>
	Mon, 11 Jan 2016 19:30:24 +0000 (19:30 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 11 Jan 2016 19:30:24 +0000 (19:30 +0000)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/Utils.java	patch \|	diff1 \|	diff2 \|	blob \| history