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

Commit 22bfecde authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-c46773e6decc4bb3908c7de93fa63602" into rvc-d1-dev-plus-aosp 

* changes:
  Switch back to using stable interfaces for DNS resolver. am: 0d234b06 am: b89de6ce
  [automerger skipped] Freeze IDnsResolver to v5. am: fc3a5314 -s ours am: 9869e048 -s ours
  [automerger skipped] Support DNS64 synthesis using externally-discovered prefixes. am: 346737c0 -s ours am: f7f87cfc -s ours
parents d7c331eb 0c6d5407
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