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

am: 895ebc7f40

Change-Id: Ifc60c79244a991731e563e020a761c99002bf39e
This commit is contained in:
Neil Fuller
2018-10-12 04:01:18 -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 \