tree 0a2e0544b947721f52d6890937b11ade9eb8f209
parent 004abb12238d34cf9567d70eac194983636524bd
parent af7a7c34e0752db2b8ec3dd7fa6e8d486ea010dc
author Andreas Huber <andih@google.com> 1283548399 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283548399 -0700

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().