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

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

[automerger skipped] Merge "Merge Android 12" am: 90701d2b -s ours am: ec3de2bc -s ours 

am skip reason: Merged-In I382fd7706a9050c786cc1a3735c7a5864dc1bd04 with SHA-1 5c3fbfc5 is already in history

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

Change-Id: I980fff33d139afbfc4b9ee1c4f14a75d21e64645
parents 21c35688 ec3de2bc
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