| commit | 448dbf8873cf72bd67d377a94a7e40f781ecdab1 | [log] [tgz] |
|---|---|---|
| author | Adam Vartanian <flooey@google.com> | Fri Dec 14 09:47:53 2018 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Dec 14 09:47:53 2018 -0800 |
| tree | 973626db6447921b1fd8c67b2d0ac362036afe27 | |
| parent | c070c9833f6b1e721af1dcf8c25782728f2e8a98 [diff] | |
| parent | 0ebdd9b3871871e6135762b823ebe8796b4f97a5 [diff] |
Merge "Add Conscrypt APEX to base image" am: 9288e5c5ad am: 0ebdd9b387 Change-Id: Ibbb5191b4cf2ab2364bdc91c53ec6a38db36adb0
diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 09bcc11..59bcecd 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk
@@ -50,6 +50,7 @@ bugreportz \ charger \ cmd \ + com.android.conscrypt \ com.android.location.provider \ com.android.resolv \ com.android.tzdata \