commit 0a765970a01a3a4154390dfc742e4fd6ef329dce
author The Android Automerger <android-build@google.com> Mon Nov 23 09:32:54 2015 -0800
committer The Android Automerger <android-build@google.com> Mon Nov 23 09:32:54 2015 -0800
tree 91a8d5933cc57dd34e92d913dfc261ed3d1855b4
parent fd1bfa2a41f5001b5e44dcfcae7cbf22d95de1a3
parent 8a4b7e5df17e0e3bd880206fd5636cfbd7223680

merge in nyc-release history after reset to master

minadbd/adb_main.cpp

diff --git a/minadbd/adb_main.cpp b/minadbd/adb_main.cpp
index 0694280..c968204 100644
--- a/minadbd/adb_main.cpp
+++ b/minadbd/adb_main.cpp
@@ -25,7 +25,7 @@
 #include "adb_auth.h"
 #include "transport.h"
 
-int adb_server_main(int is_daemon, int server_port, int /* reply_fd */) {
+int adb_main(int is_daemon, int server_port, int /* reply_fd */) {
     adb_device_banner = "sideload";
 
     signal(SIGPIPE, SIG_IGN);

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 55334db..e348b84 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -1037,7 +1037,7 @@
     // only way recovery should be run with this argument is when it
     // starts a copy of itself from the apply_from_adb() function.
     if (argc == 2 && strcmp(argv[1], "--adbd") == 0) {
-        adb_server_main(0, DEFAULT_ADB_PORT, -1);
+        adb_main(0, DEFAULT_ADB_PORT, -1);
         return 0;
     }