OSDN Git Service
(root)
/
android-x86
/
dalvik.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b40ffdb
0a31005
)
am 0a310052: resolved conflicts for merge of f3565212 to froyo-plus-aosp
author
repo sync
<enh@google.com>
Sun, 2 May 2010 23:11:56 +0000
(16:11 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Sun, 2 May 2010 23:11:56 +0000
(16:11 -0700)
Merge commit '
0a310052e8c7e150d1b983687ca94270ca91acb4
' into kraken
* commit '
0a310052e8c7e150d1b983687ca94270ca91acb4
':
Backport the setFixedLengthStreamingMode fix to froyo.
Trivial merge