| commit | 905e6feea00e4c78bde39a4c8cb914eea7272b48 | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Sat Mar 24 01:16:37 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Mar 24 01:16:37 2018 +0000 |
| tree | 7492d2be7821b4eb22ae5e53f7188fe87ddba6f7 | |
| parent | 52321d6b28a3bb79cf259ee3c68f9a837f04bdca [diff] | |
| parent | 189415933f63f12697f3070ebd5a1b7f05e39660 [diff] |
Merge "Pass all relevant resolver info to netd" am: ce907ddfc4 am: 189415933f Change-Id: I96f7747b8f0bb38d95579b688b4c2d068f1229cf