Status bar clock
AM/PM
Show/Hide

Conflicts:
	core/java/android/provider/Settings.java