OSDN Git Service

Merge "CaptivePortalLogin ignores some ssl errors." into oc-dev-plus-aosp
authorHugo Benichi <hugobenichi@google.com>
Wed, 12 Jul 2017 07:14:03 +0000 (07:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 07:14:03 +0000 (07:14 +0000)
commitfc24e1c5afca4ef6add3f2f0386675a6481454e9
tree7a238da4c126ede9b30dfa0727630c4c15a5d745
parentd2e0cd827eaed97e8bf8f5abc73c81d15d9b3a4c
parent3425a6e5c715fb879a98f9d8080f2b1f8d8d8cf2
Merge "CaptivePortalLogin ignores some ssl errors." into oc-dev-plus-aosp
am: 3425a6e5c7  -s ours

Change-Id: I1967f5540ff997645a8a2f69b4a7939a01fc69e0