OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6f38948
3ab443b
)
[automerger skipped] Merge "Shared lib def for org.apache.http.legacy comes from...
author
Jiyong Park
<jiyong@google.com>
Wed, 23 May 2018 18:09:34 +0000
(11:09 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 23 May 2018 18:09:34 +0000
(11:09 -0700)
am:
3ab443b153
-s ours
Change-Id: I2e1a1bdeec476ba10530f07ddbec7364ee781d94
Trivial merge