tree fab86e0a3bba33dcbb0558bd754f631900bcb5fe
parent c273bb9092b314cb14a42c76c61bf9615eff58e8
parent a0f16b61eb1044aaec714d32e85cbc8a064cffd4
author Jiyong Park <jiyong@google.com> 1518631766 +0000
committer android-build-merger <android-build-merger@google.com> 1518631766 +0000

Merge "Fix link-type check warning on org.apache.http.legacy.boot" am: 2b82eb996e am: 18913f95e4
am: a0f16b61eb

Change-Id: I2753bc08180d1495c38520302df8a9b52cd281db