Merge branch 'cm-12.0' of https://github.com/Sajito/android_device_htc_pyramid into cm-12.0
Merge branch 'cm-12.0' of https://github.com/Sajito/android_device_htc_pyramid into cm-12.0