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

Merge commit 'af7a7c34e0752db2b8ec3dd7fa6e8d486ea010dc'

* commit 'af7a7c34e0752db2b8ec3dd7fa6e8d486ea010dc':
  Properly buffer a certain amount of data on streaming sources before finishing prepare().