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:
cbf7a90
1345aa3
)
Merge "Fix stub_test after semantic conflicting merge."
author
Nicolas Geoffray
<ngeoffray@google.com>
Thu, 24 Mar 2016 14:38:33 +0000
(14:38 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 24 Mar 2016 14:38:33 +0000
(14:38 +0000)
am:
1345aa3
* commit '
1345aa365e8baae25d2b3a859a4858fffbe6b11f
':
Fix stub_test after semantic conflicting merge.
Trivial merge