am 6d50712e: am 9a150640: Merge "Let getOriginalMimeType() take a fd passed...
am 6d50712e: am 9a150640: Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev
* commit '6d50712e':
Let getOriginalMimeType() take a fd passed from drm java applications