OSDN Git Service

Merge "Add a timeout for the DNS probe."
authorLorenzo Colitti <lorenzo@google.com>
Tue, 23 Apr 2019 16:17:49 +0000 (09:17 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Apr 2019 16:17:49 +0000 (09:17 -0700)
commit133fe15fc06c7055c5893b8ffb61d9171e3d8198
treed511608bcfbf5fc6f66bf6a1e9f3fb97f7696098
parentfaef1f66ed56bec6ef7002c48884c6b6033395ae
parente721b4b83e28eebf1ecd7e867dd69bfea86de5a4
Merge "Add a timeout for the DNS probe."
am: e721b4b83e

Change-Id: Ieca3cc8bd1983794aaa6268cdf4237d19b23cbea