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:
1d01ef7
1fe26e1
)
Merge "Fix build aflter conflicting changes got in."
author
Nicolas Geoffray
<ngeoffray@google.com>
Thu, 18 Feb 2016 16:56:42 +0000
(16:56 +0000)
committer
Gerrit Code Review
<noreply-gerritcodereview@google.com>
Thu, 18 Feb 2016 16:56:43 +0000
(16:56 +0000)
Trivial merge