Carbon battery [2/2]

Signed-off-by: Andros Rosa <andros2011@gmail.com>

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml

Change-Id: Ic7f94e9df5342c43d3f5dfd2c9fb2d25d7382c8e

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml