| commit | b8062e17f91e75bb4cddb64e4597f38463ac736f | [log] [tgz] |
|---|---|---|
| author | repo sync <enh@google.com> | Sun May 02 16:11:56 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun May 02 16:11:56 2010 -0700 |
| tree | 0d9747818a30e1d7c635e0cce2f5a1100d5ec546 | |
| parent | b40ffdb4ba9b33d0e0778438f8701288d76020b1 [diff] | |
| parent | 0a310052e8c7e150d1b983687ca94270ca91acb4 [diff] |
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.