derp
Merge branch 'kitkat' of https://github.com/LiquidSmooth/android_packages_apps_Settings into HEAD