modified:   src/com/android/settings/cyanogenmod/StatusBar.java
Merge branch 'cm-10.2halods' of github.com:pottkopp/android_packages_apps_Settings into cm-10.2halods