DAMNIT
Merge branch 'jbam10' of github.com:BAM-Team/android_packages_apps_Settings into jbam10