commit c7b8a11974f0bf0b13f47b9fb40059b1c50ec9b6
author Elliott Hughes <enh@google.com> Fri Dec 04 17:52:33 2015 -0800
committer android-build-merger <android-build-merger@google.com> Fri Dec 04 17:52:33 2015 -0800
tree da7e1244bed17ad9a0233270cf99321f5c6bb766
parent ea2b096101d643a505f757dcd15ae5f34dcbe4ed
parent 803823f8b6663578922be595755351a9e710d93c

Merge "Track rename from base/ to android-base/." am: f31cf3ab0f am: c21980bc12
am: 803823f8b6

* commit '803823f8b6663578922be595755351a9e710d93c':
  Track rename from base/ to android-base/.

cmds/installd/commands.cpp

diff --git a/cmds/installd/commands.cpp b/cmds/installd/commands.cpp
index 2fd5cd2..e49e663 100644
--- a/cmds/installd/commands.cpp
+++ b/cmds/installd/commands.cpp
@@ -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

diff --git a/cmds/installd/installd.cpp b/cmds/installd/installd.cpp
index 52f7b9c..8dfab6b 100644
--- a/cmds/installd/installd.cpp
+++ b/cmds/installd/installd.cpp
@@ -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

diff --git a/cmds/installd/utils.cpp b/cmds/installd/utils.cpp
index 549a420..3ecad6c 100644
--- a/cmds/installd/utils.cpp
+++ b/cmds/installd/utils.cpp
@@ -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