Commit 145ba912 authored Dec 08, 2015 by Elliott Hughes Committed by android-build-merger Dec 08, 2015

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

am: 4ab13d02

* commit '4ab13d02':
  Track rename of base/ to android-base/.

libnativeloader/native_loader.cpp

+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 {