tree fdb2bb5a3b0082ec581399affe5b1bd9c02d1459
parent f1bb17c8485e59acd2d080e63645f753d93fdfa9
parent e5d30d1609f77609a6e531b498ef97ed2976f16f
author Scott Funkenhauser <sfunkenhauser@google.com> 1484658011 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1484658012 +0000

Merge "dialcheck: Make alarm timeout longer than the ssdp response timeout."