Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into cm-11.0
Merge branch 'cm-11.0' of https://github.com/cm-kang/android_packages_apps_Settings into cm-11.0