Carbonify.
Merge branch 'jb2' of git://github.com/CarbonDev/android_packages_apps_Settings into jb2

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/values/strings.xml