| commit | 5843b474a084696b006e1b4afa835c1270ab1595 | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Thu Jul 08 04:15:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 08 04:15:18 2021 +0000 |
| tree | 622f1009a8cb16edc9d826cdc58172471c17a322 | |
| parent | 9438d0fa5a2f271e2907d8735bc505de15636a65 [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: Ifdf1eab16db9955e42cf1fe233edbbe9e9504d06