Merge branch 'kitkat' of https://github.com/AOSPA-legacy/android_packages_apps_Settings into kitkat-legacy
Merge branch 'kitkat-legacy' of https://github.com/AOSPAL/android_packages_apps_Settings into kitkat-legacy