Merge remote-tracking branch 'sm/sm-jb-mr1-qs' into sm-jb-mr1
Merge branch 'sm-jb-mr1-qs' of git://github.com/SaberMod/android_packages_apps_Settings into sm-jb-mr1-qs