OSDN Git Service

am 0a310052: resolved conflicts for merge of f3565212 to froyo-plus-aosp
authorrepo sync <enh@google.com>
Sun, 2 May 2010 23:11:56 +0000 (16:11 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 2 May 2010 23:11:56 +0000 (16:11 -0700)
commitb8062e17f91e75bb4cddb64e4597f38463ac736f
tree0d9747818a30e1d7c635e0cce2f5a1100d5ec546
parentb40ffdb4ba9b33d0e0778438f8701288d76020b1
parent0a310052e8c7e150d1b983687ca94270ca91acb4
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.