tree 17ffca073bc6144ec23a93a4af63346a9351e048
parent 280f6218a578b07f0dc56e403e4b686b8cbfe950
parent 81132d5197fd2eb022a5a5587fc2fb5354ec8b22
author Wink Saville <wink@google.com> 1376005906 -0700
committer Wink Saville <wink@google.com> 1376005906 -0700

Merge commit '81132d51' into fix-merge-conflict

* commit '81132d51':
  In CaptiviePortalTracker a socket timeout is probably a captive portal.

Change-Id: I624732a5c29427bc22a156ccd46e6ff727af09c5