tree d2008b4256c21592d40a3cb96862351d5686e891
parent 3c65c1d11478e428029859e09758fc183bb21eb5
parent 01dd25c4cbb1bf0aca369fc493d70133d1efc3c2
author Luke Huang <huangluke@google.com> 1548264901 -0800
committer android-build-merger <android-build-merger@google.com> 1548264901 -0800

Merge "Cts for DnsResolver" am: 1449fe3ba5 am: ec5579e054
am: 01dd25c4cb

Change-Id: Ie01d02d4fd2687ec23f3180b4f6040ce301cd969