Commit 1879acd9 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

Merge "Revert "Move conscrypt back to core image to unblock Golem."" 

am: 458a948d

Change-Id: I3cb33cb7f916dc60a4c05bcba79b2ee894f7d459
parents 526cbb94 458a948d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment