Commit 3fe30fa7 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

Merge changes I84461d40,Ib3ab9105 into qt-dev 

* changes:
  Allow overlaying the DNS probe timeout.
  Add a timeout for the DNS probe.
parents 30a25acb d575cbfa
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment