[automerger skipped] Merge "Expose captive portal urls for configuration" into...
[automerger skipped] Merge "Expose captive portal urls for configuration" into qt-dev am: e0603420 -s ours
am: 0370f2f5 -s ours
am skip reason: change_id I54050b28bbfb93e0b7e509dbe0e987a0b902b7d9 with SHA1 8beec384 is in history
Change-Id: I6b63d5a41593844cd213e2e9000671f3390bec2b