| commit | 7d2066fecce5f9e12def6dbfaa3be52b38fe1281 | [log] [tgz] |
|---|---|---|
| author | Ulyana Trafimovich <[email protected]> | Wed Apr 08 13:21:04 2020 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Wed Apr 08 13:21:04 2020 +0000 |
| tree | a9708b68ab06fa21a0389249372f1a4d61dd8c2f | |
| parent | e1fe3b090498265febf21a6c293be07a2a40c070 [diff] | |
| parent | c6899206d9d8f758d2c361ae4219ffc808c70105 [diff] |
Merge "Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS." am: ae87e924d3 am: 9263423526 am: 63c275674d am: 97d3df59ae am: c6899206d9 Change-Id: I38fe041d81635c9fa917270e6bc92afb90443eb2