[automerger skipped] Merge "Fix captive portal can't show certificate problem" into qt-dev am: 709c46a60a
am:978f5fd2fa-s ours am skip reason: change_id I64b05adcb46baf3fca116dbdc5177bc31c71e06d with SHA1c0274d1315is in history Change-Id: Ibc123f1d1a8b8fae0568c6f295457f0646eb5df8
This commit is contained in: