commit 00ac89ebc39fd2841f543653f3518009a2fbd9d0
author Josh Gao <jmgao@google.com> Wed Jan 18 16:01:25 2017 -0800
committer Josh Gao <jmgao@google.com> Wed Jan 18 16:01:25 2017 -0800
tree 3a2b9ed5c848b332eb465de494398a88a0503c65
parent c62d02e0e5c7fd57e48b2206805169845a620ba6
parent 467ecaff086c134640bed81ebe8d03ca73d3b339

resolve merge conflicts of 467ecaff0 to master

Change-Id: Ia24f84fa163411da8172db12d918c37313c54183

cmds/dumpstate/Android.mk

diff --git a/cmds/dumpstate/Android.mk b/cmds/dumpstate/Android.mk
index 99024c3..efc050b 100644
--- a/cmds/dumpstate/Android.mk
+++ b/cmds/dumpstate/Android.mk
@@ -20,6 +20,7 @@
         libbase \
         libbinder \
         libcutils \
+        libdebuggerd_client \
         libdumpstateaidl \
         libdumpstateutil \
         liblog \

cmds/dumpstate/utils.cpp

diff --git a/cmds/dumpstate/utils.cpp b/cmds/dumpstate/utils.cpp
index 6cc430d..1b8a5e4 100644
--- a/cmds/dumpstate/utils.cpp
+++ b/cmds/dumpstate/utils.cpp
@@ -45,9 +45,9 @@
 #include <android-base/properties.h>
 #include <android-base/stringprintf.h>
 #include <android-base/strings.h>
-#include <cutils/debugger.h>
 #include <cutils/properties.h>
 #include <cutils/sockets.h>
+#include <debuggerd/client.h>
 #include <log/log.h>
 #include <private/android_filesystem_config.h>