Skip to content
Commit 6393105a authored by Hugo Benichi's avatar Hugo Benichi Committed by android-build-merger
Browse files

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

am: ae62bb1d

Change-Id: I92eceaf2295c7209166444248f0b1a719bef5f21
parents 6999649f ae62bb1d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment