Merge remote-tracking branch 'aospa-legacy/kitkat' into kitkat-legacy-staging

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/drawable-nodpi/default_wallpaper.jpg
	core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg
	core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg
	core/res/res/values/symbols.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java