OSDN Git Service

[automerger skipped] Merge "Shared lib def for org.apache.http.legacy comes from...
authorJiyong Park <jiyong@google.com>
Wed, 23 May 2018 18:09:34 +0000 (11:09 -0700)
committerandroid-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