Merge "Remove explicit dependency on conscrypt" am: 92ed75c5f7 am: 895ebc7f40

am: 12c7d2828d

Change-Id: Id13eb586715fa56a243c15fa80a39472501cc913
This commit is contained in:
Neil Fuller
2018-10-12 04:09:47 -07:00
committed by android-build-merger

View File

@@ -26,7 +26,6 @@ LOCAL_MULTILIB := both
LOCAL_JAVA_LIBRARIES := \
voip-common \
conscrypt \
org.apache.http.legacy \
android.test.base.stubs \