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

Change-Id: I6b63d5a41593844cd213e2e9000671f3390bec2b
This commit is contained in:
Remi NGUYEN VAN
2019-04-11 03:20:43 -07:00
committed by android-build-merger

Diff Content Not Available