OSDN Git Service

Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master
authorHugo Benichi <hugobenichi@google.com>
Tue, 11 Jul 2017 13:10:48 +0000 (13:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Jul 2017 13:10:48 +0000 (13:10 +0000)
commiteed04347e73b07c7c726453c5931b335ce5f0303
treeb6b90434f3438dd139de07b370e920d9bbb08812
parent4d4b9a2ac61d6b0a174c783bd16f3e2fa17fabcc
parentd23be95dd7e444e2a223efbc1cddf55e4c7bb881
Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master
am: d23be95dd7  -s ours

Change-Id: I0210c4fd8516d0f9d7b2df23dca1bd519ffc01c9