fix up
Merge branch 'master' of https://github.com/speedbot/android_device_htc_golfu_cm10
derp