Squash 4.3 changes.

Conflicts:
	AndroidManifest.xml
	res/layout-land/stopwatch_fragment.xml
	res/layout-land/time_setup_view.xml
	res/layout-land/timer_list_item.xml
	res/layout/alarm_time.xml
	res/layout/desk_clock_saver.xml
	res/layout/lap_view.xml
	res/layout/timer_list_item.xml
	res/layout/world_clock_list_item.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/strings.xml
	res/values-es/strings.xml
	res/values-fr/strings.xml
	res/values-hu/strings.xml
	res/values-it/strings.xml
	res/values-ja/strings.xml
	res/values-lt/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-ru/strings.xml
	res/values-sw600dp-land/dimens.xml
	res/values-sw600dp/dimens.xml
	res/values-sw720dp-land/dimens.xml
	res/values-sw720dp/dimens.xml
	res/values-zh-rCN/strings.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/xml/settings.xml
	src/com/android/alarmclock/DigitalWidgetViewsFactory.java
	src/com/android/alarmclock/WidgetUtils.java
	src/com/android/deskclock/AlarmAlertFullScreen.java
	src/com/android/deskclock/AlarmClock.java
	src/com/android/deskclock/AlarmKlaxon.java
	src/com/android/deskclock/DeskClock.java
	src/com/android/deskclock/SettingsActivity.java
	src/com/android/deskclock/Utils.java
	src/com/android/deskclock/stopwatch/StopwatchFragment.java
	src/com/android/deskclock/stopwatch/Stopwatches.java
	src/com/android/deskclock/timer/CountingTimerView.java
	src/com/android/deskclock/worldclock/CitiesActivity.java

Change-Id: I70cf5ce32b175412b28cbe87f2141c65581a6dc8