summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-08-19 09:11:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-19 09:11:28 -0700
commit6bcffcd2dc410db780c152c70a01b22da6ca58be (patch)
tree2f9fd5cdeb08bc8c846377a5bf2ae7ed70906a51 /libs
parent3a899b85102f6d51585b3d46ced3038c8602f202 (diff)
parent8c192fe990d7bc7149d2ec1a7c9f4ada3f32e52a (diff)
downloadframeworks_base-6bcffcd2dc410db780c152c70a01b22da6ca58be.zip
frameworks_base-6bcffcd2dc410db780c152c70a01b22da6ca58be.tar.gz
frameworks_base-6bcffcd2dc410db780c152c70a01b22da6ca58be.tar.bz2
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 '8c192fe990d7bc7149d2ec1a7c9f4ada3f32e52a' into gingerbread-plus-aosp * commit '8c192fe990d7bc7149d2ec1a7c9f4ada3f32e52a': Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions