| commit | e1313ab5389436a0c9af25fb24d0745fcc54597f | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Wed Aug 22 14:53:12 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 22 14:53:12 2012 -0700 |
| tree | 31e75609d910393b5511c0afe2cec2e09b3d544f | |
| parent | 4aa73099649056a39bd37e090c1fedd07c1ccbd5 [diff] | |
| parent | 6d50712e80777820b6f9c3a50d43c855f7eef628 [diff] |
am 6d50712e: am 9a150640: Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev * commit '6d50712e80777820b6f9c3a50d43c855f7eef628': Let getOriginalMimeType() take a fd passed from drm java applications