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:
c3880a4
5ee9454
)
resolved conflicts for merge of 5ee9454d to mnc-dev-plus-aosp
author
Sebastien Hertz
<shertz@google.com>
Thu, 9 Jul 2015 12:56:27 +0000
(14:56 +0200)
committer
Sebastien Hertz
<shertz@google.com>
Thu, 9 Jul 2015 12:56:27 +0000
(14:56 +0200)
Change-Id: I631e6ebdbc5e7abc571de133b337309ed08282e3
Trivial merge