fix build errors
fixed build errors
Merge branch 'cm-10.1' of https://github.com/swiperrat/android_packages_apps_Settings into cm-10.1
fixed build errors
removed extra volume wake from display settings