diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-16 01:45:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-11-16 01:45:17 +0000 |
| commit | d25c162ac6579d445a2a183cb975494013cad5f7 (patch) | |
| tree | 93de0c351a4ae07efcfcf35751451c884f864f1c | |
| parent | ffff5e64a671497a17bf64f6286c74a7739c44fc (diff) | |
| parent | 860ca00b85c6864e925ece68b9831a1a2a295cc2 (diff) | |
| download | okhttp-d25c162ac6579d445a2a183cb975494013cad5f7.tar.gz | |
Merge changes from topic "am-334b06d70b954d08ab75e0cbb80c0c95" into android12-tests-devandroid12-tests-dev
* changes:
[automerger skipped] Merge "Make okhttp tests ambivalent about TLS 1.x." into android11-tests-dev am: b09b3bf8ee -s ours
[automerger skipped] Make okhttp tests ambivalent about TLS 1.x. am: b05d9c427b -s ours
0 files changed, 0 insertions, 0 deletions