OSDN Git Service

Merge "CaptivePortalLogin ignores some ssl errors." into oc-dev-plus-aosp am: 3425a6e...
authorHugo Benichi <hugobenichi@google.com>
Wed, 12 Jul 2017 07:25:10 +0000 (07:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 07:25:10 +0000 (07:25 +0000)
am: fc24e1c5af  -s ours

Change-Id: Ib8317ac06817ad70f8883d97c98b94b4911b3577


Trivial merge