commit | d215507349d30017656e17607a54f466d0ec060b | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 13 18:30:04 2023 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Dec 13 18:30:04 2023 +0000 |
tree | f2bd1399d6f3d7b87b9662858b522dc6f230edfc | |
parent | a500f32815903a563b3acaa70864826493b5d8ea [diff] | |
parent | b36786b54d788757017142c3ac21dc5044171842 [diff] |
Merge changes from topic "am-a484a39e98954643a9144940c8ff7fec" into android12L-tests-dev * changes: Merge changes from topic "am-f116f6daf3bd4f109638f1ee3d9e2bd2" into android12-tests-dev am: b52640372e -s ours [automerger skipped] Merge "Fix platformDefaultTlsProtocols()." into android11-tests-dev am: 4e14ceb972 -s ours am: 322c101d14 -s ours