tree fddfd8ed97ff80a327a3c73e43b90e0bbd2e4c0c
parent 9cbd230db2cb4fe6e374b7318ec415f2513bec69
parent 50227eacc9f0ec9424f72b6a64198be06ea8c9c2
author Chalard Jean <jchalard@google.com> 1625719196 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625719196 +0000

[automerger skipped] Merge "Remove exclusivity restriction of multiple preferences" am: 278b92f6a0 am: b819ff4142 -s ours am: 5843b474a0 -s ours am: 50227eacc9 -s ours

am skip reason: Merged-In I6912db753c8b4a194aa7af92b01ca6dcfec10d8b with SHA-1 de5efb90cb is already in history

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

Change-Id: I41b7af078836d59a3cefdb0778164650bee78775