themes

Conflicts:
	res/values/slim_strings.xml
Merge branch 'kk' of https://github.com/BrokenOs/packages_apps_Settings into kk

Conflicts:
	res/values/slim_strings.xml