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