OSDN Git Service
(root)
/
android-x86
/
art.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dd6b91a
5366c20
)
resolved conflicts for merge of 5366c20d to lmp-dev-plus-aosp
author
Vladimir Marko
<vmarko@google.com>
Thu, 11 Sep 2014 17:27:39 +0000
(18:27 +0100)
committer
Vladimir Marko
<vmarko@google.com>
Thu, 11 Sep 2014 17:27:39 +0000
(18:27 +0100)
Change-Id: I65defc92aa4fcb61f3ddcbfde2851dd3fd6f2336
Trivial merge