OSDN Git Service

Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master am: d23be9...
authorHugo Benichi <hugobenichi@google.com>
Tue, 11 Jul 2017 13:17:55 +0000 (13:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Jul 2017 13:17:55 +0000 (13:17 +0000)
commit1a70ce6220c922da7c39714223003e87442e1fd5
treef926fcdd1df0b5840b22bd79b4c5786cb8d5d7e2
parent3f24335abf6ae4f0885a24b5efc93f27b3a8d087
parenteed04347e73b07c7c726453c5931b335ce5f0303
Merge "CaptivePortalLogin ignores some ssl errors." into stage-aosp-master am: d23be95dd7  -s ours
am: eed04347e7

Change-Id: I742f7418f887e2622e6e4286b47c855ef50a09bb