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