| commit | 305cc54c0b7db740b7774580e72f639a37ca72b7 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Jun 13 17:41:18 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 13 17:41:18 2022 +0000 |
| tree | ef2ad2aaf955ea5acfb38b4fc57f6687485a1dce | |
| parent | f6f84d04b243430687bc3bf1653f99d796e26bae [diff] | |
| parent | 8318e3087b4a13e833927d7c3a77b62e78cbf47b [diff] |
Merge "Track API change." am: 8318e3087b Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1955382 Change-Id: I99c19dbd03f9bbc459538040d1b1ab5cae015c91 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; }