summaryrefslogtreecommitdiffstats
path: root/media/libeffects/lvm
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2012-08-22 14:50:14 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-22 14:50:14 -0700
commit9a150640a28d3fa5507a590125a6c004681bb221 (patch)
treed45d6e643ac0fac5d0b80258b1ec38feccff4e9f /media/libeffects/lvm
parent0c676cd04ff15cc7eacf6144b4aead6deaccf60c (diff)
parentbf5b3b29e31b293313788d7464cfb258ac0da803 (diff)
downloadframeworks_av-9a150640a28d3fa5507a590125a6c004681bb221.zip
frameworks_av-9a150640a28d3fa5507a590125a6c004681bb221.tar.gz
frameworks_av-9a150640a28d3fa5507a590125a6c004681bb221.tar.bz2
Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev
Diffstat (limited to 'media/libeffects/lvm')
0 files changed, 0 insertions, 0 deletions