| commit | 0a8fd2d79f4801d1526a11c7a3f66d4ec54ff31d | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Thu Jul 08 04:15:34 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 08 04:15:34 2021 +0000 |
| tree | fddfd8ed97ff80a327a3c73e43b90e0bbd2e4c0c | |
| parent | 196b951399e43421b25ca69ce3db077a2001721e [diff] | |
| parent | b819ff414214c0ad9b1f0fefb695d7a3dd3a4b52 [diff] |
[automerger skipped] Merge "Remove exclusivity restriction of multiple preferences" am: 278b92f6a0 am: b819ff4142 -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: I914b997fb5635edae1771237326165eeec1d7021