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