Squash 4.3 changes.

Conflicts:
	res/values-af/arrays.xml
	res/values-af/strings.xml
	res/values-am/arrays.xml
	res/values-am/strings.xml
	res/values-ar/arrays.xml
	res/values-ar/strings.xml
	res/values-be/arrays.xml
	res/values-be/strings.xml
	res/values-bg/arrays.xml
	res/values-bg/strings.xml
	res/values-ca/arrays.xml
	res/values-ca/strings.xml
	res/values-cs/arrays.xml
	res/values-cs/strings.xml
	res/values-da/arrays.xml
	res/values-da/strings.xml
	res/values-de/arrays.xml
	res/values-de/strings.xml
	res/values-el/arrays.xml
	res/values-el/strings.xml
	res/values-en-rGB/arrays.xml
	res/values-en-rGB/strings.xml
	res/values-es-rUS/arrays.xml
	res/values-es-rUS/strings.xml
	res/values-es/arrays.xml
	res/values-es/strings.xml
	res/values-et/arrays.xml
	res/values-et/strings.xml
	res/values-fa/arrays.xml
	res/values-fa/strings.xml
	res/values-fi/arrays.xml
	res/values-fi/strings.xml
	res/values-fr/arrays.xml
	res/values-fr/strings.xml
	res/values-hi/arrays.xml
	res/values-hi/strings.xml
	res/values-hr/arrays.xml
	res/values-hr/strings.xml
	res/values-hu/arrays.xml
	res/values-hu/strings.xml
	res/values-in/arrays.xml
	res/values-in/strings.xml
	res/values-it/arrays.xml
	res/values-it/strings.xml
	res/values-iw/arrays.xml
	res/values-iw/strings.xml
	res/values-ja/arrays.xml
	res/values-ja/strings.xml
	res/values-ko/arrays.xml
	res/values-ko/strings.xml
	res/values-lt/arrays.xml
	res/values-lt/strings.xml
	res/values-lv/arrays.xml
	res/values-lv/strings.xml
	res/values-ms/arrays.xml
	res/values-ms/strings.xml
	res/values-nb/arrays.xml
	res/values-nb/strings.xml
	res/values-nl/arrays.xml
	res/values-nl/strings.xml
	res/values-pl/arrays.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/arrays.xml
	res/values-pt-rPT/strings.xml
	res/values-pt/arrays.xml
	res/values-pt/strings.xml
	res/values-ro/arrays.xml
	res/values-ro/strings.xml
	res/values-ru/arrays.xml
	res/values-ru/strings.xml
	res/values-sk/arrays.xml
	res/values-sk/strings.xml
	res/values-sl/arrays.xml
	res/values-sl/strings.xml
	res/values-sr/arrays.xml
	res/values-sr/strings.xml
	res/values-sv/arrays.xml
	res/values-sv/strings.xml
	res/values-sw/arrays.xml
	res/values-sw/strings.xml
	res/values-th/arrays.xml
	res/values-th/strings.xml
	res/values-tl/arrays.xml
	res/values-tl/strings.xml
	res/values-tr/arrays.xml
	res/values-tr/strings.xml
	res/values-uk/arrays.xml
	res/values-uk/strings.xml
	res/values-vi/arrays.xml
	res/values-vi/strings.xml
	res/values-zh-rCN/arrays.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rTW/arrays.xml
	res/values-zh-rTW/strings.xml
	res/values-zu/arrays.xml
	res/values-zu/strings.xml
	src/com/android/calendar/GeneralPreferences.java
	src/com/android/calendar/alerts/AlertReceiver.java
	src/com/android/calendar/alerts/AlertService.java
	src/com/android/calendar/alerts/AlertUtils.java

Change-Id: I85afb76a71e9b18f1a6e58801638a121de2d0edf