Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2

(cherry picked from commit 308e0767ad20b76128138aa190675df708170d57)