Merge "Add Conscrypt APEX to base image"
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 722ac09..639f733 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -51,6 +51,7 @@
     cameraserver \
     charger \
     cmd \
+    com.android.conscrypt \
     com.android.location.provider \
     com.android.resolv \
     com.android.tzdata \