Merge branch 'jellybean' of github.com:TeamHorizon/android_packages_apps_Settings into jellybean