Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1246180 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Remove explicit dependencies on conscrypt" am: ca980ac8 am: 2462e2de

am: 03bcf21f

Change-Id: Ie075359bbb965c524d3d20b31c8efdb38884322a
parents 0ff021aa 03bcf21f
Loading
Loading
Loading
Loading
+0 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \


LOCAL_JAVA_LIBRARIES := \
LOCAL_JAVA_LIBRARIES := \
    android.test.runner \
    android.test.runner \
    conscrypt \
    telephony-common \
    telephony-common \
    org.apache.http.legacy \
    org.apache.http.legacy \
    android.test.base \
    android.test.base \