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

am: 4ab13d0256

* commit '4ab13d025657c9d33abce428a8b00fbca83d7731':
  Track rename of base/ to android-base/.
This commit is contained in:
Elliott Hughes 2015-12-08 10:54:29 -08:00 committed by android-build-merger
commit 145ba91284

View file

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