tree e5cd252a830a53b32048a12be75eabd649b77071
parent 270e18a0442a437a3c007751374f64d45257b648
parent ca381c15d09917949fbb9fcc8280fbaec7ba937f
author Luke Huang <huangluke@google.com> 1596542871 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596542871 +0000

Merge "Add VPN test for DnsResolver" am: 12fb6a1966 am: 7d9494d2fa am: ca381c15d0

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

Change-Id: Ic540239870272942ff0a3525981bcd54c210a016