tree 98146c30dfe0556b146c92d71c42c587b28b8d45
parent 5d3a5c39c39a705b7d274a8a876e8f70f0722684
parent 9d08a4f762138ba3324680ebe1790cc7d07e0bce
author Xin Li <delphij@google.com> 1623640431 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623640431 +0000

DO NOT MERGE - Merge ab/7272582 am: 9d08a4f762

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

Change-Id: I18351a55d9603fa586556a2a3547049f5dfd1111