Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f375c5f2 authored by Mike Yu's avatar Mike Yu Committed by Automerger Merge Worker
Browse files

[automerger skipped] Fix ResolverTest.ConnectTlsServerTimeout broken am:... 

[automerger skipped] Fix ResolverTest.ConnectTlsServerTimeout broken am: 4a35e679 -s ours am: eed253f4 -s ours

am skip reason: Change-Id Iabfc14ad6b525e4cdc26f9fee83742acaee881e0 with SHA-1 ee3a62d1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/13267250

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03fb30710ba91744d617bddf7aedd97193f3077b
parents 372e12c1 eed253f4
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment