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

Commit aa0e2a5e authored by Bill Yi's avatar Bill Yi Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO... 

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: bcd90798 -s ours am: 9565e8ce -s ours am: 73ba4bb1 -s ours am: 1f02491f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I66305d68161f2bef632a40b2cea4add6e7cd13f4
parents 158e5e3e 1f02491f
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