tree f94219925bc31b140483ad339f7e48ffcb6da5fe
parent 5dba5e229a1472243e7f3944e5a5e0cdf5e57af3
parent 4d9f2268378c0f65722228e327ef1529bd48c576
author Sarah Chin <sarahchin@google.com> 1619548569 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619548569 +0000

Merge "Add tests for NetCapability#getCapabilityCarrierName" am: 45fa6bd811 am: 4d9f226837

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683350

Change-Id: I7d74dc77ea69c68138c282af74f19dd67c38253f