| commit | b7216674a277246d64498ebc1dee579b8ddeff61 | [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 | 2d667376f0cbd0fe869cd45e62731ca33f574a0b [diff] | |
| parent | e1b0a746610bc7eb5b8423b24689f22d3f0699bf [diff] |
Merge "Pass all relevant resolver info to netd" am: 6a4cdf21d2 am: e1b0a74661 Change-Id: I96f7747b8f0bb38d95579b688b4c2d068f1229cf