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

Commit 271a1a7c authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

resolve merge conflicts of a45b1d6f to master 

Test: compile
Bug: 30465923
Change-Id: I648855539df3cfa176c6ecac19b6a562ba6feaf7
parents 5f41003d a45b1d6f

adf/libadfhwc/adfhwc.cpp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <pthread.h>

#include <sys/resource.h>



#include <android/log.h>

#include <log/log.h>

#include <utils/Vector.h>



#include <adf/adf.h>

debuggerd/arm/machine.cpp

+1 −1
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
#include <string.h>

#include <sys/ptrace.h>



#include <android/log.h>

#include <backtrace/Backtrace.h>

#include <log/log.h>



#include "machine.h"

#include "utility.h"

debuggerd/arm64/machine.cpp

+1 −1
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
#include <sys/ptrace.h>

#include <sys/uio.h>



#include <android/log.h>

#include <backtrace/Backtrace.h>

#include <log/log.h>



#include "machine.h"

#include "utility.h"

debuggerd/backtrace.cpp

+1 −1
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
#include <memory>

#include <string>



#include <android/log.h>

#include <backtrace/Backtrace.h>

#include <log/log.h>



#include "backtrace.h"

debuggerd/debuggerd.cpp

+1 −1
Original line number Diff line number Diff line
@@ -42,12 +42,12 @@ 


#include <selinux/android.h>



#include <android/log.h>

#include <android-base/file.h>

#include <android-base/unique_fd.h>

#include <cutils/debugger.h>

#include <cutils/properties.h>

#include <cutils/sockets.h>

#include <log/log.h>



#include <private/android_filesystem_config.h>