commit | eac4afb4748691f0092dcaf6a26f482be42c6cf1 | [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 | 905e6feea00e4c78bde39a4c8cb914eea7272b48 [diff] | |
parent | c54b9cb71a7278f3993313019438f4c1d85aaa88 [diff] |
[automerger skipped]Merge "Pass all relevant resolver info to netd" into pi-dev am: ca697c621e -s ours Change-Id: I5d2271059f77d290c65cd4a55d31334154e82270