summaryrefslogtreecommitdiffstats
path: root/media/libeffects
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-08-21 09:40:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-21 09:40:57 -0700
commit91d113e8daa9d71c4ea8afd595a3921e03787cbf (patch)
treefea830e50f39e59aaef2e5935bbb86a708d027d8 /media/libeffects
parent69e0b8c5556df1d4db1a730db1c13409a96749c7 (diff)
parentb9b08ff55456fe845cb4c64500e9cb53682e202f (diff)
downloadframeworks_av-91d113e8daa9d71c4ea8afd595a3921e03787cbf.zip
frameworks_av-91d113e8daa9d71c4ea8afd595a3921e03787cbf.tar.gz
frameworks_av-91d113e8daa9d71c4ea8afd595a3921e03787cbf.tar.bz2
am 6bcffcd2: am 8c192fe9: Merge "Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description." into gingerbread
Merge commit '6bcffcd2dc410db780c152c70a01b22da6ca58be' * commit '6bcffcd2dc410db780c152c70a01b22da6ca58be': Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.
Diffstat (limited to 'media/libeffects')
0 files changed, 0 insertions, 0 deletions