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

Commit f503bee0 authored by Xin Li's avatar Xin Li Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge Android R am: 333377b4 -s ours am: 8fe29f90 -s... 

[automerger skipped] Merge Android R am: 333377b4 -s ours am: 8fe29f90 -s ours am: 39d2bed8 -s ours am: d7823018 -s ours am: 6d62bc0c -s ours

am skip reason: Change-Id I84f04ecdd900ae5f77f409c8b325f9a447afb8a3 with SHA-1 9a057c71 is in history

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

Change-Id: I473d9bee237dbd982b53c7d5ad1be25fc708be92
parents 34c1e8cb 6d62bc0c
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