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

Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master am:... 

Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master am: d23be95d  -s ours am: eed04347
am: 1a70ce62

Change-Id: I57a942589fbc00ad588eb8ba7176cbd89cb8174a
parents d8aad5ac 1a70ce62
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