Status bar clock
AM/PM
Show/Hide

Conflicts:
	res/values/ras_arrays.xml
	res/values/ras_strings.xml
	res/xml/status_bar_settings.xml
	src/com/android/settings/rascarlo/StatusBarSettings.java