commit | 50227eacc9f0ec9424f72b6a64198be06ea8c9c2 | [log] [tgz] |
---|---|---|
author | Chalard Jean <jchalard@google.com> | Thu Jul 08 04:28:38 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 08 04:28:38 2021 +0000 |
tree | 1e99723e02962444f32d34f25b2b1fa60bcc4af9 | |
parent | 544872f16c797b13845ef51e11b05ba744640657 [diff] | |
parent | 5843b474a084696b006e1b4afa835c1270ab1595 [diff] |
[automerger skipped] Merge "Remove exclusivity restriction of multiple preferences" am: 278b92f6a0 am: b819ff4142 -s ours am: 5843b474a0 -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: I9d89c3519a491ff2e729469cec35edee30c30934