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:
ac53d43
1107c8f
)
resolved conflicts for merge of 1107c8f3 to mnc-dev-plus-aosp
author
Roland Levillain
<rpl@google.com>
Mon, 29 Jun 2015 13:28:23 +0000
(14:28 +0100)
committer
Roland Levillain
<rpl@google.com>
Mon, 29 Jun 2015 13:29:02 +0000
(14:29 +0100)
Change-Id: Id084ba7a4c95479696b0b414dbd29a68b9e7d02c
Trivial merge