Merge branch 'jellybean' of github.com:ParanoidAndroid/android_packages_...

...apps_Settings into jellybean-legacy