am 5191b859: Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev
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.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base