commit e82033a897b0c27671e292155a3b7eb6b4c79a40
author Dan Albert <danalbert@google.com> Fri May 08 18:27:40 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 08 18:27:40 2015 +0000
tree 8cbfdd2b69ae6d36dcacaadec6f12b0f899a040c
parent c23a39b1a48c4ed30605fd10f04ee7a1781d529c
parent 9cd94f87283159d80a51e1fce6ff68c97158b7ae

am 9cd94f87: am cfe46542: am 3128176e: Merge "Fix build following adb change."

* commit '9cd94f87283159d80a51e1fce6ff68c97158b7ae':
  Fix build following adb change.

minadbd/adb_main.cpp

diff --git a/minadbd/adb_main.cpp b/minadbd/adb_main.cpp
index f6e2401..0e65386 100644
--- a/minadbd/adb_main.cpp
+++ b/minadbd/adb_main.cpp
@@ -26,13 +26,9 @@
 #include "adb.h"
 #include "transport.h"
 
-int adb_main(int is_daemon, int server_port)
-{
-    atexit(usb_cleanup);
-
+int adb_main(int is_daemon, int server_port) {
     adb_device_banner = "sideload";
 
-    // No SIGCHLD. Let the service subproc handle its children.
     signal(SIGPIPE, SIG_IGN);
 
     init_transport_registration();