tree 21a8f1a91b14b1f84d38e811365e79141f5dd95c
parent b6dfe17c7d13168ab4cb65cfc1289b7ac84e0266
parent 44e40c93b706bcce0104a21248daf84a2b71ae71
author Lorenzo Colitti <lorenzo@google.com> 1614157171 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614157171 +0000

Merge "Stop using CaptivePortalData in the shim interfaces." am: ee6648c467 am: 5478c66890 am: 44e40c93b7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1598153

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief95eb9acecae14b6d79fe000391a4d17cf2ccc9