Merge branch 'jb-mv' of git://github.com/Mustaavalkosta/android_device_htc_ace into jb-mr1
Merge branch 'jb-mr1' of https://github.com/PipelinerArd/android_device_htc_ace into cm-10.1