| commit | a877b58853abf655938203f2e8a0674f1d324ada | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Sat Mar 24 16:12:38 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Mar 24 16:12:38 2018 +0000 |
| tree | 7492d2be7821b4eb22ae5e53f7188fe87ddba6f7 | |
| parent | b7216674a277246d64498ebc1dee579b8ddeff61 [diff] | |
| parent | 05c62dfd61f96e22c9f10cbbdbe1648c7b7d2806 [diff] |
[automerger skipped]Merge "Pass all relevant resolver info to netd" into pi-dev am: ca697c621e -s ours Change-Id: I5d2271059f77d290c65cd4a55d31334154e82270