tree 31f4876b7b24ce0c59c7ae14cc1150b7f00c910f
parent 7c432691adc4ae1d0c81c160ed375eae90d7772f
parent 892630b03f982ff00036ad96b6a1ce5bce796561
author Mike Yu <yumike@google.com> 1566800922 -0700
committer android-build-merger <android-build-merger@google.com> 1566800922 -0700

Merge "Let resolv_integration_test listen to onPrivateDnsValidationEvent" am: 6ddb0a2e41 am: 04d22a9319
am: 892630b03f

Change-Id: Ic5f1528d45384db85eeb407db090011116231882