am af7a7c34: am cc4a38c6: Merge "Properly buffer a certain amount of data on...
am af7a7c34: am cc4a38c6: Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread
Merge commit 'af7a7c34'
* commit 'af7a7c34':
Properly buffer a certain amount of data on streaming sources before finishing prepare().