modified:   res/xml/liquid_main_settings.xml
	new file:   res/xml/liquid_main_settings.xml~
Merge branch 'kitkat3' of https://github.com/Uzumaki99/android_packages_apps_Settings into kitkat3