| commit | 1879acd9e64adcf214e850f0c0a67e8519d1492b | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Wed Jan 09 01:28:28 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 09 01:28:28 2019 -0800 |
| tree | c36714f1762d406001a24d8479a05116ab2d2ab7 | |
| parent | 526cbb944cbb2303bb57d0f218e1c3722b2171b9 [diff] | |
| parent | 458a948d4fc954d767103b5a95803a0a60be9f1c [diff] |
Merge "Revert "Move conscrypt back to core image to unblock Golem."" am: 458a948d4f Change-Id: I3cb33cb7f916dc60a4c05bcba79b2ee894f7d459