commit 04f8fe722c98c743647d226320849e30303b31ab
author Elliott Hughes <enh@google.com> Wed Feb 17 21:07:30 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 17 21:07:30 2016 +0000
tree ce9671e0d7527782a3c503c2ed9a83ab42a777a2
parent a3894b574f534b9806d1529bdfba951c8189594e
parent b3639658ed307aca879007a88a74631f5feb6962

Merge "Remove two bogus libutils dependencies." am: fd9619004b
am: b3639658ed

* commit 'b3639658ed307aca879007a88a74631f5feb6962':
  Remove two bogus libutils dependencies.

libcutils/tests/PropertiesTest.cpp

diff --git a/libcutils/tests/PropertiesTest.cpp b/libcutils/tests/PropertiesTest.cpp
index 659821c..22ca706 100644
--- a/libcutils/tests/PropertiesTest.cpp
+++ b/libcutils/tests/PropertiesTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #define LOG_TAG "Properties_test"
-#include <utils/Log.h>
+#include <cutils/log.h>
 #include <gtest/gtest.h>
 
 #include <cutils/properties.h>

libpackagelistparser/packagelistparser.c

diff --git a/libpackagelistparser/packagelistparser.c b/libpackagelistparser/packagelistparser.c
index 16052e2..e309027 100644
--- a/libpackagelistparser/packagelistparser.c
+++ b/libpackagelistparser/packagelistparser.c
@@ -27,7 +27,7 @@
 #include <sys/limits.h>
 
 #define LOG_TAG "packagelistparser"
-#include <utils/Log.h>
+#include <cutils/log.h>
 
 #include <packagelistparser/packagelistparser.h>