summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-10-19 10:08:32 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-19 10:08:32 -0700
commit60d6ac48ea94f9613e21200f3bcf04b7e818ba11 (patch)
treeac03296024f34290f31ad0a91185729ebef3864d /media/libmediaplayerservice
parent475c5fabc59a86eb667f3afb4b1523f9b98797e3 (diff)
parent4769cc92740e3ab58e9263d42553c12bbf79e3be (diff)
downloadframeworks_av-60d6ac48ea94f9613e21200f3bcf04b7e818ba11.zip
frameworks_av-60d6ac48ea94f9613e21200f3bcf04b7e818ba11.tar.gz
frameworks_av-60d6ac48ea94f9613e21200f3bcf04b7e818ba11.tar.bz2
am 52bea277: Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread
Merge commit '52bea277ff92a2a1780e035c82c72082434e7b16' into gingerbread-plus-aosp * commit '52bea277ff92a2a1780e035c82c72082434e7b16': If we encounter video stream EOS while seeking we may still need to seek audio.
Diffstat (limited to 'media/libmediaplayerservice')
0 files changed, 0 insertions, 0 deletions