tree bd769a8dc774508bdacce487442ee98aa037ed2f
parent e877871a745a61de862e70074954324915c3963f
parent a2cbef908e2cef5b1c7b45be07b06c883e017909
author Remi NGUYEN VAN <reminv@google.com> 1644819315 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1644819315 +0000

Merge "Allow test+other networks to have specifiers" am: 106569b856 am: a2cbef908e

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

Change-Id: I0c1dbe0fb47d534a1d1dd694c31059ca192f6f97