tree 40eb66a100c6098f336bdc276f5ddf5af76613ef
parent c0f6e3e29cb076106b46e6682a04d4774d8aefbf
author Pete Bentley <prb@google.com> 1680092593 +0100
committer Pete Bentley <prb@google.com> 1680092593 +0100

Revert ^2 "Merge Conscrypt upstream master.""

This reverts commit 55f75a645170bb5cbcd072121c57556d73f8b515.

Reason for revert: Re-landing with fix.

Up until Android 12, BC advertised an X.509 CertificateFactory
so skip testing it on all releases.

Bug: 275484241
Test: atest
MtsConscryptTestCases:com.android.org.conscrypt.java.security.cert.X509CertificateTest
    against an Android 11 device.
Change-Id: I669741e71fbbbdda979dc2e852c68f6636a0a255