diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-16 02:18:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-11-16 02:18:43 +0000 |
| commit | d18fec2189c768fd336c7314d86d1a23a35d3f2e (patch) | |
| tree | 93de0c351a4ae07efcfcf35751451c884f864f1c | |
| parent | 48629c761c0ae8859662a292738d3dd81366f844 (diff) | |
| parent | 1c91db4bea1b46dd6ee58d5893cc9d92508cc480 (diff) | |
| download | okhttp-d18fec2189c768fd336c7314d86d1a23a35d3f2e.tar.gz | |
Merge changes from topic "am-9c2da1b757324288949b43f201c4a0f5" into android12L-tests-devandroid12L-tests-dev
* changes:
Merge changes from topic "am-334b06d70b954d08ab75e0cbb80c0c95" into android12-tests-dev am: d25c162ac6 -s ours
[automerger skipped] Merge "Make okhttp tests ambivalent about TLS 1.x." into android11-tests-dev am: b09b3bf8ee -s ours am: 860ca00b85 -s ours
0 files changed, 0 insertions, 0 deletions