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)
am: 3425a6e5c7  -s ours

Change-Id: I1967f5540ff997645a8a2f69b4a7939a01fc69e0


Trivial merge