tree 3edfdfd7503126d0729ad306ff81c51a426612cd
parent 0a76af09b1b3f7d37944950267f3f23ab1d336f7
parent d56856876f75287e464093763a98af1f0373d8bf
author Hugo Benichi <hugobenichi@google.com> 1499693851 +0000
committer android-build-merger <android-build-merger@google.com> 1499693851 +0000

Merge "CaptivePortalLogin ignores some ssl errors."
am: d56856876f  -s ours

Change-Id: I6e4b778a7ea4ca9425834ed37c7f2b59cf458186