Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1

Conflicts:
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/Settings.java

Change-Id: Id7de234388ba9e9b4223ddab900a335424207b2f

Conflicts:
	res/drawable-hdpi/appwidget_settings_ind_on_c_holo.9.png
	res/drawable-hdpi/appwidget_settings_ind_on_l_holo.9.png
	res/drawable-hdpi/appwidget_settings_ind_on_r_holo.9.png
	res/drawable-hdpi/ic_appwidget_settings_bluetooth_off_holo.png
	res/drawable-hdpi/ic_appwidget_settings_bluetooth_on_holo.png
	res/drawable-hdpi/ic_appwidget_settings_brightness_auto_holo.png
	res/drawable-hdpi/ic_appwidget_settings_brightness_full_holo.png
	res/drawable-hdpi/ic_appwidget_settings_brightness_half_holo.png
	res/drawable-hdpi/ic_appwidget_settings_brightness_off_holo.png
	res/drawable-hdpi/ic_appwidget_settings_location_off_holo.png
	res/drawable-hdpi/ic_appwidget_settings_location_on_holo.png
	res/drawable-hdpi/ic_appwidget_settings_sync_off_holo.png
	res/drawable-hdpi/ic_appwidget_settings_sync_on_holo.png
	res/drawable-hdpi/ic_appwidget_settings_wifi_off_holo.png
	res/drawable-hdpi/ic_appwidget_settings_wifi_on_holo.png
	res/drawable-mdpi/appwidget_settings_ind_on_c_holo.9.png
	res/drawable-mdpi/appwidget_settings_ind_on_l_holo.9.png
	res/drawable-mdpi/appwidget_settings_ind_on_r_holo.9.png
	res/drawable-mdpi/ic_appwidget_settings_bluetooth_off_holo.png
	res/drawable-mdpi/ic_appwidget_settings_bluetooth_on_holo.png
	res/drawable-mdpi/ic_appwidget_settings_brightness_auto_holo.png
	res/drawable-mdpi/ic_appwidget_settings_brightness_full_holo.png
	res/drawable-mdpi/ic_appwidget_settings_brightness_half_holo.png
	res/drawable-mdpi/ic_appwidget_settings_brightness_off_holo.png
	res/drawable-mdpi/ic_appwidget_settings_location_off_holo.png
	res/drawable-mdpi/ic_appwidget_settings_location_on_holo.png
	res/drawable-mdpi/ic_appwidget_settings_sync_off_holo.png
	res/drawable-mdpi/ic_appwidget_settings_sync_on_holo.png
	res/drawable-mdpi/ic_appwidget_settings_wifi_off_holo.png
	res/drawable-mdpi/ic_appwidget_settings_wifi_on_holo.png
	res/drawable-nodpi/preview.png
	res/drawable-xhdpi/appwidget_settings_ind_on_c_holo.9.png
	res/drawable-xhdpi/appwidget_settings_ind_on_l_holo.9.png
	res/drawable-xhdpi/appwidget_settings_ind_on_r_holo.9.png
	res/drawable-xhdpi/ic_appwidget_settings_bluetooth_off_holo.png
	res/drawable-xhdpi/ic_appwidget_settings_bluetooth_on_holo.png
	res/drawable-xhdpi/ic_appwidget_settings_brightness_auto_holo.png
	res/drawable-xhdpi/ic_appwidget_settings_brightness_full_holo.png
	res/drawable-xhdpi/ic_appwidget_settings_brightness_half_holo.png
	res/drawable-xhdpi/ic_appwidget_settings_brightness_off_holo.png
	res/drawable-xhdpi/ic_appwidget_settings_location_off_holo.png
	res/drawable-xhdpi/ic_appwidget_settings_location_on_holo.png
	res/drawable-xhdpi/ic_appwidget_settings_sync_off_holo.png
	res/drawable-xhdpi/ic_appwidget_settings_sync_on_holo.png
	res/drawable-xhdpi/ic_appwidget_settings_wifi_off_holo.png
	res/drawable-xhdpi/ic_appwidget_settings_wifi_on_holo.png
	res/drawable-xxhdpi/ic_appwidget_settings_location_off_holo.png
	res/drawable-xxhdpi/ic_appwidget_settings_location_on_holo.png
	src/com/android/settings/DevelopmentSettings.java
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/cyanogenmod/LockscreenInterface.java