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