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:
35df572
afa87d5
)
[automerger skipped] Merge "DO NOT MERGE" am: c5db7f8f22 -s ours
author
Xin Li
<delphij@google.com>
Mon, 10 Dec 2018 18:54:04 +0000
(10:54 -0800)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 10 Dec 2018 18:54:04 +0000
(10:54 -0800)
am:
afa87d5e95
-s ours
Change-Id: I4c4a9d31347325a7744e1bd69832d901c6cefe58
Trivial merge