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

Skip to content
Commit 80e543d3 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[automerger skipped] Merge "Extend ResolverTest.BrokenEdns to cover... 

Merge "[automerger skipped] Merge "Extend ResolverTest.BrokenEdns to cover using EDNS0 for cleartext DNS" into rvc-dev am: 7384ec8d am: 3a03b844 -s ours" into rvc-d1-dev-plus-aosp am: 5055a887 -s ours

am skip reason: Change-Id I373fc134a56abc12dc3ff24b3cd144c9a37f4844 with SHA-1 3977d487 is in history

Change-Id: I7ea5dd81c5ab7d7b00c45726f314340f1c1962d2
parents 38f76b0f 5055a887
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