summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSasha Smundak <asmundak@google.com>2019-01-31 20:14:43 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-31 20:14:43 -0800
commit77972f7c488f7a2543e47e6db1f5477d044a043d (patch)
tree216517e80110fbe12fb2b33ab8f95955b973cb2b
parent91085a11f794bbd84858f429ff1ad30372560e9f (diff)
parent99e30586023f2cf2bfb3612fdbff3a4e7a13f6b8 (diff)
downloadlibhardware-77972f7c488f7a2543e47e6db1f5477d044a043d.tar.gz
Merge "Explicitly include log/log.h instead of cutils/log.h" am: 68222be667 am: 4b0a646750
am: 99e3058602 Change-Id: I9ccccabeeadaf742ebb4e00264c9dfbd8e769e3c
-rw-r--r--modules/sensors/multihal.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/sensors/multihal.cpp b/modules/sensors/multihal.cpp
index a1f01046..f41d72fb 100644
--- a/modules/sensors/multihal.cpp
+++ b/modules/sensors/multihal.cpp
@@ -18,7 +18,7 @@
#include "multihal.h"
#define LOG_NDEBUG 1
-#include <cutils/log.h>
+#include <log/log.h>
#include <cutils/atomic.h>
#include <hardware/sensors.h>