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:
aeab711
a7b3540
)
resolved conflicts for merge of a7b3540b to mnc-dev-plus-aosp
author
Nicolas Geoffray
<ngeoffray@google.com>
Mon, 22 Jun 2015 13:42:42 +0000
(14:42 +0100)
committer
Nicolas Geoffray
<ngeoffray@google.com>
Mon, 22 Jun 2015 13:42:42 +0000
(14:42 +0100)
Change-Id: I3950ece84ef637f37f89b9fdb7feb983bf961d5c
Trivial merge