summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/MidiFile.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-09-28 00:34:12 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-28 00:34:12 -0700
commit592364b53ddde403d6bc0db7cf5ed592f7e12dd0 (patch)
treeb057b54041552b5f889e1d558a15412cf3d4de43 /media/libmediaplayerservice/MidiFile.cpp
parentadca8d0f4b2e9d229da56eeda587590c79aa036b (diff)
parentbf5d85e633d5818b47e5fd92d69bec7963fc3d52 (diff)
downloadframeworks_av-592364b53ddde403d6bc0db7cf5ed592f7e12dd0.zip
frameworks_av-592364b53ddde403d6bc0db7cf5ed592f7e12dd0.tar.gz
frameworks_av-592364b53ddde403d6bc0db7cf5ed592f7e12dd0.tar.bz2
am bf5d85e6: am 5cfd237f: Merge "Prepend SPS/PPS manually before encryption in HDCP mode. This is" into jb-mr1-dev
* commit 'bf5d85e633d5818b47e5fd92d69bec7963fc3d52': Prepend SPS/PPS manually before encryption in HDCP mode. This is
Diffstat (limited to 'media/libmediaplayerservice/MidiFile.cpp')
0 files changed, 0 insertions, 0 deletions