refs/tags/android-mainline-12.0.0_r23 - platform/packages/modules/NetworkStack

tag: f04b44ec1ef581c4b48b30b0b9fdeb468edd58f4
tagger: The Android Open Source Project <initial-contribution@android.com>
Fri Jan 28 22:06:03 2022 -0800
object: fdf1365104c3d5f4e1bab1f39b8b533e424b47e2

Android Mainline 12.0.0 Release 23 (7569208,com.google.android.captiveportallogin)

commit: fdf1365104c3d5f4e1bab1f39b8b533e424b47e2
[log]
author: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Wed Jul 21 10:38:34 2021 +0000
committer: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Wed Jul 21 10:38:34 2021 +0000
tree: 1a3832fff81596ec38283518dc261a03aa32d257
parent: 77a13f2f344e1792441158f18ff977e48abb086e [diff]
parent: 2f3750aa66f757d9b3d619767b9ab43c4f2fca60 [diff]

Merge cherrypicks of [15347097, 15347098] into sparse-7550996-L60300000950383421

Change-Id: Iabb3b47d2ddcbb3477a5c531ac23dfb0f3e392c2