PerformanceControl

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

Conflicts:
	res/values/cm_strings.xml

Change-Id: I953f1adff31749e3bfb11aeb11b900501bb264d2