| commit | 81132d5197fd2eb022a5a5587fc2fb5354ec8b22 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Thu Aug 08 15:46:49 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 08 15:46:49 2013 -0700 |
| tree | 882ab772cb189cc331742c2b565bdcdc6bcfb696 | |
| parent | 81b1fa6fc62190d64a6b76b4a5ee7cc2bf3172ac [diff] | |
| parent | b9b4321b756ac6e44650031ebfe0134508f60eaa [diff] |
am b9b4321b: am 5191b859: Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev * commit 'b9b4321b756ac6e44650031ebfe0134508f60eaa': In CaptiviePortalTracker a socket timeout is probably a captive portal.