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

Skip to content
Commit 9b2004f9 authored by Xin Li's avatar Xin Li Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge 24Q4 into AOSP main am: 2c32fa15 -s ours am: 6ce4e112 -s ours 

am skip reason: Merged-In Ia9218acb79e339f88cedab3558a2c5807a38a7d5 with SHA-1 3f370bd8 is already in history

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



Change-Id: I10df4860f4688a18bae5d16d5b4a67982c49693b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0ba8a7e9 6ce4e112
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