tree d5d952c0d040e59d778a0c829eec1bb78f194b33
parent 55e73c27a885a60e064c2c4043f1909d987f0b89
parent 1a80ff943dec702993dfe735614225ec4202a381
author Lucas Lin <lucaslin@google.com> 1553065679 -0700
committer android-build-merger <android-build-merger@google.com> 1553065679 -0700

Merge "Fix the problem of CaptivePortalLogin app cannot show SSL error page"
am: 1a80ff943d

Change-Id: Ief7b9c8f172fa3ad5a1143d998d455797c1bf937