commit | 9c2150c62a5bcea38a47133e84b6817f535530ff | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 08 10:27:38 2023 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Dec 08 10:27:38 2023 +0000 |
tree | f2bd1399d6f3d7b87b9662858b522dc6f230edfc | |
parent | 786f9f52f9d59102c66fd53ac01c41148b44661d [diff] | |
parent | d6a566b29fb144e02a0dab1863daf74e98186b59 [diff] |
Merge changes from topic "am-3c58e23b974840d3941b861caf9b346f" into android12L-tests-dev * changes: [automerger skipped] Merge "Fix platformDefaultTlsProtocols()." into android12-tests-dev am: e535f1761c -s ours [automerger skipped] Fix platformDefaultTlsProtocols(). am: 6d0d0a3521 -s ours