tree 7492d2be7821b4eb22ae5e53f7188fe87ddba6f7
parent 52321d6b28a3bb79cf259ee3c68f9a837f04bdca
parent 189415933f63f12697f3070ebd5a1b7f05e39660
author Erik Kline <ek@google.com> 1521854197 +0000
committer android-build-merger <android-build-merger@google.com> 1521854197 +0000

Merge "Pass all relevant resolver info to netd" am: ce907ddfc4
am: 189415933f

Change-Id: I96f7747b8f0bb38d95579b688b4c2d068f1229cf