[automerger skipped] Merge "Let DnsManager fill in LinkProperties for private DNSes" am: 6b5358f16e

am: 6bbbb06bc7  -s ours

Change-Id: I7a0f888a7f5f0e7424f6ad01fe155bbe48089b87
This commit is contained in:
Chalard Jean
2018-05-01 02:12:52 -07:00
committed by android-build-merger

Diff Content Not Available