OSDN Git Service

[automerger skipped]Merge "Pass all relevant resolver info to netd" into pi-dev
authorErik Kline <ek@google.com>
Sat, 24 Mar 2018 16:12:38 +0000 (16:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 24 Mar 2018 16:12:38 +0000 (16:12 +0000)
commitad8d7e3e44f3a8d0879588cbc3398b99fd23e045
treef7a8d1b7d78b07665af21d607c18d5b432e8a745
parent7b436db89cff80b734036cc0b09601107bbeaf14
parentca697c621e448a50e1c0d8a021e37efa7a6a0983
[automerger skipped]Merge "Pass all relevant resolver info to netd" into pi-dev
am: ca697c621e  -s ours

Change-Id: I5d2271059f77d290c65cd4a55d31334154e82270