tree 5f3fc5dfa377a0e990fda45269186ec70734d751
parent c880a803d1e075a4063c3f7b37a4e50c121a09e7
parent 1d3c59457c9bcf30e6ecb898e64d9d9725e7803e
author Lorenzo Colitti <lorenzo@google.com> 1461821122 +0000
committer android-build-merger <android-build-merger@google.com> 1461821122 +0000

Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev
am: 1d3c594

* commit '1d3c59457c9bcf30e6ecb898e64d9d9725e7803e':
  Make isCaptivePortal perform both HTTP and HTTPS probes.

Change-Id: Ic58f5be8dce42c17213ef261f348eda31c6c11e7