[automerger skipped] Merge "Expose captive portal urls for configuration" into qt-dev am: c100196133 -s ours
am:d728605afe-s ours am skip reason: change_id I54050b28bbfb93e0b7e509dbe0e987a0b902b7d9 with SHA1a6dad121c5is in history Change-Id: I6b63d5a41593844cd213e2e9000671f3390bec2b
This commit is contained in: