OSDN Git Service

am b9b4321b: am 5191b859: Merge "In CaptiviePortalTracker a socket timeout is probabl...
authorWink Saville <wink@google.com>
Thu, 8 Aug 2013 22:46:49 +0000 (15:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Aug 2013 22:46:49 +0000 (15:46 -0700)
commit81132d5197fd2eb022a5a5587fc2fb5354ec8b22
tree882ab772cb189cc331742c2b565bdcdc6bcfb696
parent81b1fa6fc62190d64a6b76b4a5ee7cc2bf3172ac
parentb9b4321b756ac6e44650031ebfe0134508f60eaa
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.