[automerger skipped] Merge "Expose captive portal urls for configuration" into qt-dev

am: c7a083a15e -s ours
am skip reason: change_id I54050b28bbfb93e0b7e509dbe0e987a0b902b7d9 with SHA1 9b84ea14a8 is in history

Change-Id: I15a4acf4355e05833ed15bde3deb0db966f2a75a
This commit is contained in:
Remi NGUYEN VAN
2019-04-10 23:31:51 -07:00
committed by android-build-merger

Diff Content Not Available