tree d375ea69020bcf94844ffe4d7c693ef4a328d60b
parent ee901b76dbabacb6f0b42c5240a6e298975bc7f6
parent 8e4f34e4ca0a6d1f554ed39b462fea2dd56d81f0
author Benedict Wong <benedictwong@google.com> 1645132301 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1645132301 +0000

[automerger skipped] Merge "Add type string to VCN NetworkAgentConfig" into sc-v2-dev am: 8e4f34e4ca -s ours

am skip reason: Merged-In I059dbc997f97482f7355fdc29d464d5452933ce3 with SHA-1 37a6ef1cd6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908681

Change-Id: Ic43a2b4e8c91d8c79347a891117eb0e341c43949