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:
a5e881c
de43dd8
)
resolved conflicts for merge of de43dd8c to dalvik-dev
author
Elliott Hughes
<enh@google.com>
Fri, 25 Jun 2010 15:06:32 +0000
(08:06 -0700)
committer
Elliott Hughes
<enh@google.com>
Fri, 25 Jun 2010 15:06:32 +0000
(08:06 -0700)
Change-Id: Id5c74939c8f1bd6441ca8a49c452ba972068696e
Trivial merge