tree 00c1a87935d912b2e53887b63b812d5698257e17
parent 192f0c63f1356e131d3e4f9dc9bff21c4eb7955e
parent 44a20af4a32f68bec07e57aeb0c7a9fd09bf228c
author Treehugger Robot <treehugger-gerrit@google.com> 1638179059 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638179059 +0000

Merge "Competing network interfaces" am: 44a20af4a3

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

Change-Id: I358c9a83623dd93ce06d423bcde7720f1dc39a84