One more derp
Merge branch 'jellybean' of https://github.com/UltimatumKang/android_packages_apps_Settings into jellybean