| commit | b9b4321b756ac6e44650031ebfe0134508f60eaa | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Thu Aug 08 15:43:07 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 08 15:43:07 2013 -0700 |
| tree | 99309e88ec971dfa523ff5b2fbd6f33f553cd89e | |
| parent | 9b6363e5e6d37e3e8d103751d81613eeca32bbbf [diff] | |
| parent | 5191b8599011c255936e3a3cacc052c03e57b772 [diff] |
am 5191b859: Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev * commit '5191b8599011c255936e3a3cacc052c03e57b772': In CaptiviePortalTracker a socket timeout is probably a captive portal.