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