Merge branch 'jb-mv' of git://github.com/Mustaavalkosta/android_device_htc_msm7x30-common into cm-10.1
Revert "cleanup headers after kernel include changes"

This reverts commit 7e31f686a83275d8321af09001f492f421f4c30c.
msm7x30: build libc2dcolorconvert (@paulb-nl)

Change-Id: I854539502bad3a1a2c5ce2ba3f49797bc1d75bf2
Merge branch 'jb-mv' of git://github.com/Mustaavalkosta/android_device_htc_msm7x30-common into cm-10.1
DeviceSettings: add settings for new s2w/dt2w

Seekbar taken from ChaOS' Appbar feature.

Change-Id: I20486232497795d8c8ae0038bf6b3e634102422e
media_profile: update using tuna as a reference

Change-Id: Ie4b7f8c0f0a2547dc1d05eb858e7558894bcc229
Merge branch 'jb-mv' of git://github.com/Mustaavalkosta/android_device_htc_msm7x30-common into cm-10.1
Merge branch 'cm-10.1' of github.com:yanniks/android_device_htc_msm7x30-common into jellybean