CyanogenMod Circle Battery (2/2)

Change-Id: I4ec2916b8c3bd5ffb413f9542bd687a9f987663e

Conflicts:

	res/values/arrays.xml
	res/values/strings.xml