summaryrefslogtreecommitdiffstats
path: root/media/mtp/MtpDevice.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-10-19 11:19:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-19 11:19:55 -0700
commit74e1e56dfa15be0ffea82c60d81846c4f6615421 (patch)
tree5026e6f89f12c1ba8f67d9249c51c2a427827270 /media/mtp/MtpDevice.cpp
parenta3764dee0d52e65d16005a411e2d4efd0af20953 (diff)
parent60d6ac48ea94f9613e21200f3bcf04b7e818ba11 (diff)
downloadframeworks_av-74e1e56dfa15be0ffea82c60d81846c4f6615421.zip
frameworks_av-74e1e56dfa15be0ffea82c60d81846c4f6615421.tar.gz
frameworks_av-74e1e56dfa15be0ffea82c60d81846c4f6615421.tar.bz2
am 2d00c605: am 52bea277: Merge "If we encounter video stream EOS while seeking we may still need to seek audio." into gingerbread
Merge commit '2d00c6050977f3e03665fbfef93f4f6aed041a63' * commit '2d00c6050977f3e03665fbfef93f4f6aed041a63': If we encounter video stream EOS while seeking we may still need to seek audio.
Diffstat (limited to 'media/mtp/MtpDevice.cpp')
0 files changed, 0 insertions, 0 deletions