tree 5acf624cf30c54ae9debb74f5ebc4a6eacdce519
parent 4e0841524bc77fc928782a2c858853f68c73d13d
parent d4c0d59179128d58ed482c0f0b3117d71898d67a
author Luke Huang <huangluke@google.com> 1628270997 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628270997 +0000

Merge "Use dns resolver v9 in connectivity and set resolverOptions to null." am: d4c0d59179

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

Change-Id: I4fc4579247497a74489b028b040da2425415a312