Skip to content
Commit 1a70ce62 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: d23be95d -s ours 

am: eed04347

Change-Id: I742f7418f887e2622e6e4286b47c855ef50a09bb
parents 3f24335a eed04347
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