| commit | ced1a697840cbd2780582a2bd9e6c1c0aa39c41d | [log] [tgz] |
|---|---|---|
| author | Pete Bentley <prb@google.com> | Thu Nov 09 01:23:34 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 09 01:23:34 2023 +0000 |
| tree | 28a625fb9e651ee46188522476e2c844541adc59 | |
| parent | ccb73764e19f74c992a9679ee8e10695933439ae [diff] | |
| parent | 77f9eef2d51a2c4edcbb8675e94bb0669693a2da [diff] |
Revert "Merge Conscrypt upstream master." am: 77f9eef2d5 Original change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/2821976 Change-Id: Ia792e971917388fa57eb0f837c7017c305760769 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>