tree ca786330d3eee54b37163a0d74d5f86b26273f3c
parent f57ad0ff6eff98690ffdb521a7b27c117f7b80ac
parent 73ba4bb14a1c68407b6b2723226871a57abde5c4
author Bill Yi <byi@google.com> 1600122016 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600122016 +0000

[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: bcd90798ff -s ours am: 9565e8ce1c -s ours am: 73ba4bb14a -s ours

am skip reason: Change-Id I621749fd6b3722efccd481e647d69768048a2c18 with SHA-1 a00743f837 is in history

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

Change-Id: I905f63e23ae66c3136d0fe37cf69f4082491c3fb