merge:CM10DNA/android_device_htc_dlx