tree a7dac13317c6b8ad8606c367ff676590b15b82fd
parent 955c5d0e21097a4baccc3174fa43e9cfe45cfa9b
parent 031ecf372128a786a9ae84aee9c681af7a0c7db1
author Andreas Huber <andih@google.com> 1283385839 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283385839 -0700

am fd0eed00: am a2511da9: Merge "Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread

Merge commit 'fd0eed007d99178092ede56ec2c4799046615f70'

* commit 'fd0eed007d99178092ede56ec2c4799046615f70':
  Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data.