Status bar Clock and Battery

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java