tree 28a625fb9e651ee46188522476e2c844541adc59
parent 48dd765d25f4a35ba577c461145a1001732e5470
author Pete Bentley <prb@google.com> 1699481564 +0000
committer Pete Bentley <prb@google.com> 1699482155 +0000

Revert "Merge Conscrypt upstream master."

This reverts commit 1305ff71cf7d1607eaefc88a2b394024fcbe019d.

Reason for revert: b/309698683

Change-Id: I96bcda9f31ce4b22c26435a1f7dcb6e9ef1b0542