tree 5bc3494d697f5c73808bf5464861c7ac09036493
parent 6d0cb4eb5141564f6dd4b77d033856e7402317ac
parent 2efac57093ca9612352f211b10117da79baa9370
author Mike Yu <yumike@google.com> 1608694312 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608694312 +0000

Merge changes I3afe28f5,Id9fc9b78 am: db91ce9717 am: 2efac57093

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I281663be5f94f7b45543c606bc206461c0b7bfe1