commit | a500f32815903a563b3acaa70864826493b5d8ea | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 13 09:52:39 2023 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Dec 13 09:52:39 2023 +0000 |
tree | f2bd1399d6f3d7b87b9662858b522dc6f230edfc | |
parent | 9c2150c62a5bcea38a47133e84b6817f535530ff [diff] | |
parent | b275cfefa9168d3862219e9d556dc1b53342b8a3 [diff] |
Merge changes from topic "am-f2ad219dca3543f4bef71ec57284baff" into android12L-tests-dev * changes: Merge changes from topic "am-79e52fb1da4842749d8aff189d23a029" into android12-tests-dev am: e4b2194520 -s ours [automerger skipped] Merge "Luni URLConnectionTest: Don't depend on TLSv1*" into android11-tests-dev am: d32caa0e58 -s ours am: fcde107780 -s ours