tree 0d9747818a30e1d7c635e0cce2f5a1100d5ec546
parent b40ffdb4ba9b33d0e0778438f8701288d76020b1
parent 0a310052e8c7e150d1b983687ca94270ca91acb4
author repo sync <enh@google.com> 1272841916 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1272841916 -0700

am 0a310052: resolved conflicts for merge of f3565212 to froyo-plus-aosp

Merge commit '0a310052e8c7e150d1b983687ca94270ca91acb4' into kraken

* commit '0a310052e8c7e150d1b983687ca94270ca91acb4':
  Backport the setFixedLengthStreamingMode fix to froyo.