modified:   res/xml/system_settings.xml
Merge branch 'cm-10.2' of github.com:pottkopp/android_packages_apps_Settings into cm-10.2