Merge changes from topic "backport-connectivityresources" am: 2cff13b0fc

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

Change-Id: Id6e8f89870b70332212e9052168e6f7c2faa3ee3
This commit is contained in:
Lorenzo Colitti
2021-03-21 16:51:02 +00:00
committed by Automerger Merge Worker

View File

@@ -68,8 +68,6 @@
<item>VPN</item>
</string-array>
<!-- Network type names used in the network_switch_metered and network_switch_metered_detail strings. These must be kept in the sync with the values NetworkCapabilities.TRANSPORT_xxx values, and in the same order. -->
<!-- Network type name displayed if one of the types is not found in network_switch_type_name. -->
<string name="network_switch_type_name_unknown">an unknown network type</string>