Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00ac89eb authored by Josh Gao's avatar Josh Gao
Browse files

resolve merge conflicts of 467ecaff to master 

Change-Id: Ia24f84fa163411da8172db12d918c37313c54183
parents c62d02e0 467ecaff

cmds/dumpstate/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ COMMON_SHARED_LIBRARIES := \ 
        libbase \

        libbinder \

        libcutils \

        libdebuggerd_client \

        libdumpstateaidl \

        libdumpstateutil \

        liblog \

cmds/dumpstate/utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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>