OSDN Git Service

Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into...
authorJames Dong <jdong@google.com>
Wed, 22 Aug 2012 21:50:14 +0000 (14:50 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 22 Aug 2012 21:50:14 +0000 (14:50 -0700)
commit9a150640a28d3fa5507a590125a6c004681bb221
treed45d6e643ac0fac5d0b80258b1ec38feccff4e9f
parent0c676cd04ff15cc7eacf6144b4aead6deaccf60c
parentbf5b3b29e31b293313788d7464cfb258ac0da803
Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev