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:
cff569c
ae77d6b
)
resolved conflicts for merge of ae77d6b6 to master
author
Brian Carlstrom
<bdc@google.com>
Fri, 2 Aug 2013 19:28:22 +0000
(12:28 -0700)
committer
Brian Carlstrom
<bdc@google.com>
Fri, 2 Aug 2013 19:28:22 +0000
(12:28 -0700)
Change-Id: If7712cbddd6786c91648c4fc31f04e96937d4670
Trivial merge