tree 8899b553fbd42c74fef5a0f51a08b70ec1017294
parent b9b56954ec5a242f7c4945942539106539f98ffb
parent 0889fdae87abd9ec78a6c1d00c2771acfa4e4d34
author James Dong <jdong@google.com> 1345672227 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1345672227 -0700

Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev