summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorJohn Grossman <johngro@google.com>2012-09-06 12:34:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-06 12:34:22 -0700
commit7d44fabece5f2d63a66ff2e44e330b77a6285e82 (patch)
tree1c34e45c3af498c9a703c2d424b2b587eb1232ff /media/libmediaplayerservice
parent582d7468612766cf7b3653f4ad29580307a8686a (diff)
parentc56857b4cd12cd4bc3361e375f5b7554277ce9d7 (diff)
downloadframeworks_av-7d44fabece5f2d63a66ff2e44e330b77a6285e82.zip
frameworks_av-7d44fabece5f2d63a66ff2e44e330b77a6285e82.tar.gz
frameworks_av-7d44fabece5f2d63a66ff2e44e330b77a6285e82.tar.bz2
am c56857b4: Merge "Fix calculations for an obscure combo of MPEG audio options." into jb-mr1-dev
* commit 'c56857b4cd12cd4bc3361e375f5b7554277ce9d7': Fix calculations for an obscure combo of MPEG audio options.
Diffstat (limited to 'media/libmediaplayerservice')
0 files changed, 0 insertions, 0 deletions