[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 SHA1 c0274d1315 is in history

Change-Id: I8b637490b79bc202530e095644ad7e23c434e59f
This commit is contained in:
Mark Chien
2019-05-30 02:19:36 -07:00
committed by android-build-merger

Diff Content Not Available