Commit 8fe29f90 authored Sep 11, 2020 by Xin Li Committed by Automerger Merge Worker Sep 11, 2020

[automerger skipped] Merge Android R am: 333377b4 -s ours

am skip reason: Change-Id I84f04ecdd900ae5f77f409c8b325f9a447afb8a3 with SHA-1 9a057c71 is in history

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

Change-Id: Iea4bc0bd9a624f5863bdae8d906221eef7bbedb6

There are no changes