aboutsummaryrefslogtreecommitdiff
path: root/tests/resolv_test_utils.cpp
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2023-12-11 22:02:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-11 22:02:48 +0000
commit66f4b829990dc3b7aca4fd4adb83fb07e484fb43 (patch)
tree3f2d4b574793f50707e52ae8152d1ea95926bbf5 /tests/resolv_test_utils.cpp
parent5d6d427165ba5267127e16ad4997731c35b2fe0b (diff)
parent4e631f7e9376ac374d7585c48654230a3505d0f1 (diff)
[automerger skipped] Merge Android 14 QPR1 am: b7f8f54573 -s ours am: 4e631f7e93 -s ours
am skip reason: Merged-In I668bbfe6942526dae1840e36c21abb05fe033e9a with SHA-1 2787b9e267 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2866393 Change-Id: I50982ca478f54250f7f881524467ef8140d35573 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tests/resolv_test_utils.cpp')
0 files changed, 0 insertions, 0 deletions