tree d3484345158a34b6b12692d6d211d10f11852901
parent 04db3e300385f655f34f768ae65a7890a636fddb
parent d3db72339eec493b126f2eb0c308c8b221782b65
author Benedict Wong <benedictwong@google.com> 1645159327 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1645159327 +0000

[automerger skipped] Merge "Add type string to VCN NetworkAgentConfig" into sc-v2-dev am: 8e4f34e4ca -s ours am: d3db72339e -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: Ie108f3f3a55327cd4b43dcbe908ccdf8b0a620b8