tree c0746a98047750b16b0ed8a85172235f431bb5c5
parent 30a25acb83b0cd4cd765768a045633c81fe8b224
parent d575cbfa346e410e151c836f9d7c1d3eac46c02a
author Lorenzo Colitti <lorenzo@google.com> 1556093486 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1556093486 +0000

Merge changes I84461d40,Ib3ab9105 into qt-dev

* changes:
  Allow overlaying the DNS probe timeout.
  Add a timeout for the DNS probe.