OSDN Git Service
(root)
/
android-x86
/
external-libffi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
67f8aff
c5db7f8
)
[automerger skipped] Merge "DO NOT MERGE"
author
Xin Li
<delphij@google.com>
Mon, 10 Dec 2018 17:51:00 +0000
(09:51 -0800)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 10 Dec 2018 17:51:00 +0000
(09:51 -0800)
am:
c5db7f8f22
-s ours
Change-Id: I0684ed2a838e3c68d2e4ec48707b09a400f0e642
Trivial merge