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

Commit f31cf3ab authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Track rename from base/ to android-base/."

parents 7166e782 e4ec9eb7

cmds/installd/commands.cpp

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


#include "installd.h"



#include <base/stringprintf.h>

#include <base/logging.h>

#include <android-base/stringprintf.h>

#include <android-base/logging.h>

#include <cutils/sched_policy.h>

#include <diskusage/dirsize.h>

#include <logwrap/logwrap.h>

cmds/installd/installd.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#include "installd.h"



#include <base/logging.h>

#include <android-base/logging.h>



#include <sys/capability.h>

#include <sys/prctl.h>

cmds/installd/utils.cpp

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


#include "installd.h"



#include <base/stringprintf.h>

#include <base/logging.h>

#include <android-base/stringprintf.h>

#include <android-base/logging.h>



#define CACHE_NOISY(x) //x