Clock options

Conflicts:
	res/values/strings.xml

 Author:    IT_Blackbelt <jmeade300@gmail.com>
 On branch jb422
 Changes to be committed:
	modified:   res/values/arrays.xml
	modified:   res/values/strings.xml
	modified:   res/xml/date_time_prefs.xml
	modified:   src/com/android/settings/DateTimeSettings.java

Change-Id: I5320e16e3b39059366e5bfc3fc353dd0d9b9bfea