| commit | 9a150640a28d3fa5507a590125a6c004681bb221 | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Wed Aug 22 14:50:14 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 22 14:50:14 2012 -0700 |
| tree | d45d6e643ac0fac5d0b80258b1ec38feccff4e9f | |
| parent | 0c676cd04ff15cc7eacf6144b4aead6deaccf60c [diff] | |
| parent | bf5b3b29e31b293313788d7464cfb258ac0da803 [diff] |
Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev