1% battery

Change-Id: Ib2074c1d709cd386d53b56d4bb4fb1d937cb31ba

(Fixed) Conflicts (with):
	services/jni/com_android_server_BatteryService.cpp