| commit | d9038b78537be5e682ad0a373230ecaee86c01e2 | [log] [tgz] |
|---|---|---|
| author | repo sync <enh@google.com> | Sun May 02 16:24:16 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun May 02 16:24:16 2010 -0700 |
| tree | 48ee639c8f2db317b12c850dcb719862410c536b | |
| parent | a5ca991457ac5c0cb8694821bf5c790f2a062462 [diff] | |
| parent | 23498ca0a60505d5a38c37cc770cd7e4a7cf50f0 [diff] |
am 23498ca0: am e6d15c5f: am b8062e17: am 0a310052: resolved conflicts for merge of f3565212 to froyo-plus-aosp Merge commit '23498ca0a60505d5a38c37cc770cd7e4a7cf50f0' into dalvik-dev * commit '23498ca0a60505d5a38c37cc770cd7e4a7cf50f0': Backport the setFixedLengthStreamingMode fix to froyo.