Nicer version (1/2)
Merge branch 'cm-10.2' of https://github.com/CyanFox/android_packages_apps_Settings into cm-10.2