summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Benichi <hugobenichi@google.com>2017-07-11 13:10:48 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-11 13:10:48 +0000
commit7fcd76bbc7604fb29f4c4ddefba7fc2e59c2eb12 (patch)
tree16eb0b4580d87f3f82d2d2633ccc220e4e1b2658
parentca5e726e190ef93e1bf20a764c6fc61b21ee6ddf (diff)
parentb5f04dc46f23f00872347ef2ac38c19ad2355714 (diff)
downloadCaptivePortalLogin-7fcd76bbc7604fb29f4c4ddefba7fc2e59c2eb12.tar.gz
Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master
am: d23be95dd7 -s ours Change-Id: I0210c4fd8516d0f9d7b2df23dca1bd519ffc01c9
0 files changed, 0 insertions, 0 deletions