| commit | 499653b886012556a4a78ba4e1d51773e3f95e21 | [log] [tgz] |
|---|---|---|
| author | Miguel Aranda <miguelaranda@google.com> | Wed Dec 13 18:29:56 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 13 18:29:56 2023 +0000 |
| tree | f2bd1399d6f3d7b87b9662858b522dc6f230edfc | |
| parent | a500f32815903a563b3acaa70864826493b5d8ea [diff] | |
| parent | 322c101d14c0e786fd5fd377af58f8d66ebd6891 [diff] |
[automerger skipped] Merge "Fix platformDefaultTlsProtocols()." into android11-tests-dev am: 4e14ceb972 -s ours am: 322c101d14 -s ours am skip reason: Merged-In Ie29f457fcaf795a9c024f6fdd8ae0cbf161e36d7 with SHA-1 6d0d0a3521 is already in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/2852905 Change-Id: I3d38dfde9adb0a5e7c2edf9a2a634c30cca40730 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>