| commit | 34626dd9eb8ec4f41e375e285ac2dbd1717c0fdc | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Jun 13 19:48:30 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 13 19:48:30 2022 +0000 |
| tree | a6cd383350ec45790d8ce56aa78571ff1e40be20 | |
| parent | 5b7047e2207c83681be18b4f564d7d090b41e5a1 [diff] | |
| parent | eb54d43b6837e1239eedcb10634349db28348e8a [diff] |
Merge "Track API change." am: 8318e3087b am: 305cc54c0b am: 43995f88c9 am: 6f188d1769 am: eb54d43b68 Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1955382 Change-Id: I8928e93f4758d23729dd07b9d87ae809ef18ee27 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/minadbd/minadbd_services.cpp b/minadbd/minadbd_services.cpp index 0abe867..16bcb5e 100644 --- a/minadbd/minadbd_services.cpp +++ b/minadbd/minadbd_services.cpp
@@ -305,7 +305,7 @@ } } -asocket* daemon_service_to_socket(std::string_view) { +asocket* daemon_service_to_socket(std::string_view, atransport*) { return nullptr; }