tree 2b1f6a87fa174c501aab4f6942265e37060ab0ee
parent d54cc5debd3e4efd95d3938d4f9a57b4a777645d
parent cf9596ddee1c6040f79f77e0ca8ae875ded5a0e9
author Lorenzo Colitti <lorenzo@google.com> 1622443823 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622443823 +0000

am 18225508: am 49052093: Merge "Fix captive portal detection on IPv6 networks." into klp-dev am: cf9596ddee

Original change: undetermined

Change-Id: I40f94adfd7f7ef9719d8cca9f18433a18c5547bc