wambo's SU
system anti
Merge branch 'master' of https://github.com/Blak-KANG/android_packages_apps_Settings

Conflicts:
	res/values/blak_strings.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/blak/SystemUiSettings.java