From: Jiyong Park <jiyong@google.com>
Date: Wed, 23 May 2018 18:09:34 +0000 (-0700)
Subject: [automerger skipped] Merge "Shared lib def for org.apache.http.legacy comes from... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3281e43a8b74121f62589233b542c5bdd8d40e98;p=android-x86%2Fframeworks-base.git

[automerger skipped] Merge "Shared lib def for org.apache.http.legacy comes from java_sdk_library" into pi-dev-plus-aosp
am: 3ab443b153  -s ours

Change-Id: I2e1a1bdeec476ba10530f07ddbec7364ee781d94
---

3281e43a8b74121f62589233b542c5bdd8d40e98