tree 57aafbeb5d625ccd266c552388bd10ebb70bf24f
parent 5254c0c2431e97bf21e6cd8d05d0e8bead697329
parent f427d49541b1ed7926a81e51929769238952ba01
author Lorenzo Colitti <lorenzo@google.com> 1615559882 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615559882 +0000

Merge "Add a test for upstream selection." am: f427d49541

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I891027b54d90fb01784158ec690f3880c5125f42