Clock: Second Clock from Provision Team (2/2)

Conflicts:

	res/values/strings.xml
	res/xml/status_bar_clock_style.xml
	src/com/android/settings/sleepy/StatusBarClockStyle.java