tree 25a5622bd00b0123a30d83c2643432d91fa0d00f
parent c8c937bcb6817151a9c828da5af1b26cb819ed45
parent a6a241a3192ee65bd95d3d294926d36b25865006
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582283917 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582283917 +0000

Merge "Reduce DnsResolverTest flaky rate" am: de7f28fcf4 am: 3f998cd2dd am: a6a241a319

Change-Id: I8352a6b85cf8e9dc0a5af63f8a83d226e2949df0