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:
8f7f250
18218b8
)
resolved conflicts for merge of 18218b8b to mnc-dev-plus-aosp
author
Nicolas Geoffray
<ngeoffray@google.com>
Mon, 22 Jun 2015 13:04:33 +0000
(14:04 +0100)
committer
Nicolas Geoffray
<ngeoffray@google.com>
Mon, 22 Jun 2015 13:04:33 +0000
(14:04 +0100)
Change-Id: I30ae4f273eda2d4ecf2fbc0147012a9fa750c9d5
Trivial merge