| commit | 2752f7f4b19b0ac46eacbdf3f7372719cfa1a6c0 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Sun Mar 21 16:51:02 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Mar 21 16:51:02 2021 +0000 |
| tree | 95cc6c8eeb6aef275cfa436589dfab8d7c45372c | |
| parent | 5b8376a888b5183f80b347a6f38342655fcde46a [diff] | |
| parent | 2cff13b0fc71136b1807b3f74179c887608666fc [diff] |
Merge changes from topic "backport-connectivityresources" am: 2cff13b0fc Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645297 Change-Id: Id6e8f89870b70332212e9052168e6f7c2faa3ee3
diff --git a/service/ServiceConnectivityResources/res/values/strings.xml b/service/ServiceConnectivityResources/res/values/strings.xml index 7a9cf57..b2fa5f5 100644 --- a/service/ServiceConnectivityResources/res/values/strings.xml +++ b/service/ServiceConnectivityResources/res/values/strings.xml
@@ -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>