Merge branch 'kitkat-wip' into kitkat
Merge branch 'kitkat' of https://github.com/AOSPE/android_packages_apps_Settings into kitkat