commit | 6393105afb1793ba4250cab838dd2e5a6ad8d7c2 | [log] [tgz] |
---|---|---|
author | Hugo Benichi <hugobenichi@google.com> | Mon Jul 10 13:47:15 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jul 10 13:47:15 2017 +0000 |
tree | 8eed58e527aae6f9a065e5a22133f85c8a397b26 | |
parent | 6999649f0d70ecfdeb07685b3955c9b6423f52ad [diff] | |
parent | ae62bb1d41e9a969d1ef751476f8dc2fdedf7b6c [diff] |
Merge "CaptivePortalLogin ignores some ssl errors." am: d56856876f -s ours am: ae62bb1d41 Change-Id: I92eceaf2295c7209166444248f0b1a719bef5f21