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