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

Skip to content
Commit a2fccc24 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: I4ea08b7deb8ff92a0d16054331c647b892833975
parents 531c02b8 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