Merge branch 'jellybean' of github.com:ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy