Fix for the commit below
Merge https://github.com/ModdedPA/android_packages_apps_Settings into jb43

Conflicts:
	src/com/android/settings/DevelopmentSettings.java