Fixed a fuck up
Merge branch 'lp' of https://github.com/BrokenOs/packages_apps_Settings into lp

Conflicts:
	res/values/colors.xml