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:27 +0000 (14:50 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 22 Aug 2012 21:50:27 +0000 (14:50 -0700)
commitd78fc5b94d1bb3dab509ca55d09052821c51412b
tree8899b553fbd42c74fef5a0f51a08b70ec1017294
parentb9b56954ec5a242f7c4945942539106539f98ffb
parent0889fdae87abd9ec78a6c1d00c2771acfa4e4d34
Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev
drm/jni/android_drm_DrmManagerClient.cpp