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

Commit 62b8dfd2 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android (Google) Code Review
Browse files

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

parents fbc65644 e7d2cc30

tools/aapt2/flatten/TableFlattener.cpp

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include "flatten/TableFlattener.h"

#include "util/BigBuffer.h"



#include <base/macros.h>

#include <android-base/macros.h>

#include <type_traits>

#include <numeric>

tools/aapt2/unflatten/BinaryResourceParser.cpp

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


#include <androidfw/ResourceTypes.h>

#include <androidfw/TypeWrappers.h>

#include <base/macros.h>

#include <android-base/macros.h>



#include <map>

#include <string>