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