tree 21031edce3eb8fe4542440f33a94e23fdb4ac058
parent 5ea6b0c1e3b153b8801273c8dc318fca86376433
parent 510dd27f3a3447392ef356ee4feafe08a115ef20
author Gurpreet Singh <gurpreetgs@google.com> 1646672725 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646672725 +0000

Merge "Using common apex_defaults for com.android.resolv module." am: 6e346f3eb4 am: 510dd27f3a

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

Change-Id: Ia8fd2f2405a3a42b606d77fc634479e711261941