Merge "[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 SHA1 c0274d1315 is in history" into qt-r1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
96f935def1