tree a9708b68ab06fa21a0389249372f1a4d61dd8c2f
parent e1fe3b090498265febf21a6c293be07a2a40c070
parent c6899206d9d8f758d2c361ae4219ffc808c70105
author Ulyana Trafimovich <skvadrik@google.com> 1586352064 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586352064 +0000

Merge "Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS." am: ae87e924d3 am: 9263423526 am: 63c275674d am: 97d3df59ae am: c6899206d9

Change-Id: I38fe041d81635c9fa917270e6bc92afb90443eb2