summaryrefslogtreecommitdiffstats
path: root/media/libmedia/mediarecorder.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-10-14 23:22:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-14 23:22:21 -0700
commitd6119356f45c9c57cac812357d969ecc3001087e (patch)
tree571a3fd12bab8ff32a863507d4e907e750456af9 /media/libmedia/mediarecorder.cpp
parent11b72e19970f620adfb1aa458b45ff06cec77f10 (diff)
parent43024e1f4953d9b8891b7b72f10e76f11812e772 (diff)
downloadframeworks_av-d6119356f45c9c57cac812357d969ecc3001087e.zip
frameworks_av-d6119356f45c9c57cac812357d969ecc3001087e.tar.gz
frameworks_av-d6119356f45c9c57cac812357d969ecc3001087e.tar.bz2
am 28b93967: am 165c6579: Merge "HTTP Live content that are tagged as complete are now seekable." into gingerbread
Merge commit '28b93967d0e702304c7edec854a29d5ab88bfce0' * commit '28b93967d0e702304c7edec854a29d5ab88bfce0': HTTP Live content that are tagged as complete are now seekable.
Diffstat (limited to 'media/libmedia/mediarecorder.cpp')
0 files changed, 0 insertions, 0 deletions