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

Commit c40e941d authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Track rename of base/ to android-base/." am: 4ab13d02

am: 145ba912

* commit '145ba912':
  Track rename of base/ to android-base/.
parents b49b09a4 145ba912
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@
#include <string>
#include <mutex>

#include "base/macros.h"
#include "base/strings.h"
#include "android-base/macros.h"
#include "android-base/strings.h"

namespace android {