Commit 43eea999 authored Dec 14, 2018 by Adam Vartanian Committed by android-build-merger Dec 14, 2018

Merge "Add Conscrypt APEX to base image" am: 9288e5c5 am: 0ebdd9b3

am: 448dbf88

Change-Id: If1bab7a86e11503d837a8c9ad46e46f10ab51fe9

target/product/base_system.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ PRODUCT_PACKAGES += \
		bugreportz \
		charger \
		cmd \
		com.android.conscrypt \
		com.android.location.provider \
		com.android.media \
		com.android.resolv \