Thanks SlayJay78
derp

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
Cambio contador batería