tree ec5ee29cac4934d75d08cc2e6b81fd7012c80707
parent 8b46acba25e33889b275fc6639df75aa2c8a32f2
parent 44d0cda8efce506c75d9546d2e4de4686bf70d58
author Hugo Benichi <hugobenichi@google.com> 1500026371 +0000
committer android-build-merger <android-build-merger@google.com> 1500026371 +0000

Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev-plus-aosp
am: 44d0cda8ef

Change-Id: I5bf2282984b9ed40d838cb6ae30c4ab694a8e160