| commit | 71b1250911145ab7186f4fde5b9544120841081a | [log] [tgz] |
|---|---|---|
| author | Igor Zaslavsky <igorzas@google.com> | Mon Sep 11 22:12:26 2023 +0000 |
| committer | Igor Zaslavsky <igorzas@google.com> | Tue Sep 12 00:02:44 2023 +0000 |
| tree | 6a53203d0ce32b89902f489f8d3ad30379adc41f | |
| parent | 3a684c163caf0a989e0cbaff38648f040bb2ca15 [diff] | |
| parent | 96bd45aad97dea0150fa46941e03b6fcbe31f65b [diff] |
[resolve-conflict] Implement Discovery PLATFORM logic in Rust am: 3521a5ed8a am: 96bd45aad9 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2736090 Ignore-AOSP-First: Resolving a conflict with aosp-main Change-Id: Ic1c6a44b50447b0b3fa53f85474305fcfb3add73 Merged-in: I17f73b4fb2e22924a484eeb3baa9b933ae980076 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>