OSDN Git Service

Merge "CaptivePortalLogin ignores some ssl errors." am: d56856876f -s ours am: ae62b...
authorHugo Benichi <hugobenichi@google.com>
Mon, 10 Jul 2017 13:53:58 +0000 (13:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Jul 2017 13:53:58 +0000 (13:53 +0000)
am: 6393105afb

Change-Id: I76dac07dd54ee15992d59a1e75eff5f3c2de6c25


Trivial merge