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