mer-hybris/droid-hal-device — pull request #52 by beidl (2014-09-02 17:25:36+00:00)
Title: [maguro] Fix RPM file conflicts regarding gstomx.conf

gst-omx and dhd packages conflict because of /etc/xdg/gstomx.conf. Fixed.