summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-09-05 08:41:07 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-05 08:41:07 -0700
commit033389e4954eb74f76f0608b69a70e7215ff0940 (patch)
tree1d4d8bc4252bbaf1e346dc784debae5aedd66aee /media/libmediaplayerservice
parent812ee4e0e4648e36e94e7c56b4ac87cbce5e148b (diff)
parent2316c56dc9311a1b66c93ce7e3da6e243c412450 (diff)
downloadframeworks_av-033389e4954eb74f76f0608b69a70e7215ff0940.zip
frameworks_av-033389e4954eb74f76f0608b69a70e7215ff0940.tar.gz
frameworks_av-033389e4954eb74f76f0608b69a70e7215ff0940.tar.bz2
am 2316c56d: am 6c75ad21: Merge "Configure the SurfaceMediaSource to emit the same number of buffers" into jb-mr1-dev
* commit '2316c56dc9311a1b66c93ce7e3da6e243c412450': Configure the SurfaceMediaSource to emit the same number of buffers
Diffstat (limited to 'media/libmediaplayerservice')
0 files changed, 0 insertions, 0 deletions