tree b44a3fdcce94e648ae7092c6db6fa9e7281cd796
parent 577f3e158da434b830ce6dfe5a506f6db9d130cd
parent 278b92f6a0c125d3de62bcacced5c1effe61cf2d
author Chalard Jean <jchalard@google.com> 1625717145 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625717145 +0000

Merge "Remove exclusivity restriction of multiple preferences" am: 278b92f6a0

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

Change-Id: Ib41c5050c389ac115221005f565ff4f59a799502