double derp

Change-Id: I1c2bddf411cca7f0fe5655c7ec24cdcbb56eb907
Merge branch 'ck44' of https://github.com/CandyShop/candykat_packages_apps_Settings into ck44

Conflicts:
	AndroidManifest.xml

Change-Id: Id3fdb8fad83b5bafe2135c5b977cc68da1bfaece