edited
Merge branch 'master' of github.com:caplio/android_device_htc_dlxj