Merge branch 'cm-10.1' of github.com:CyanogenMod/android_packages_apps_Settings into cm
Merge branch 'cm' into jellybean