tree 125c71b2773af1f1ccc4f56f4e54f9c3facc1c64
parent 0eea822c79308473c37795e0c3360c36ed8802c4
parent 59e139a767b5552a0c42ce236ff59f843900e842
author Chalard Jean <jchalard@google.com> 1525148241 -0700
committer android-build-merger <android-build-merger@google.com> 1525148241 -0700

Merge "Let DnsManager fill in LinkProperties for private DNSes"
am: 59e139a767

Change-Id: Icd79a15c573a3bc2f371d724081e296eca2b236f