Merge "hikey960: gralloc960: Fix log.h include to avoid warnings"
diff --git a/gralloc960/framebuffer_device.cpp b/gralloc960/framebuffer_device.cpp
index 44c4695..a45d0c3 100644
--- a/gralloc960/framebuffer_device.cpp
+++ b/gralloc960/framebuffer_device.cpp
@@ -23,7 +23,7 @@
#include <sys/ioctl.h>
#include <linux/fb.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include <cutils/atomic.h>
#include <hardware/hardware.h>
#include <hardware/fb.h>
diff --git a/gralloc960/gralloc_buffer_priv.cpp b/gralloc960/gralloc_buffer_priv.cpp
index 274dec2..30b49ce 100644
--- a/gralloc960/gralloc_buffer_priv.cpp
+++ b/gralloc960/gralloc_buffer_priv.cpp
@@ -17,7 +17,7 @@
*/
#include <cutils/ashmem.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include <sys/mman.h>
#if GRALLOC_USE_GRALLOC1_API == 1
diff --git a/gralloc960/mali_gralloc_formats.cpp b/gralloc960/mali_gralloc_formats.cpp
index a62898c..32272d7 100644
--- a/gralloc960/mali_gralloc_formats.cpp
+++ b/gralloc960/mali_gralloc_formats.cpp
@@ -19,7 +19,7 @@
#include <string.h>
#include <dlfcn.h>
#include <inttypes.h>
-#include <cutils/log.h>
+#include <log/log.h>
#if GRALLOC_USE_GRALLOC1_API == 1
#include <hardware/gralloc1.h>
diff --git a/gralloc960/mali_gralloc_module.cpp b/gralloc960/mali_gralloc_module.cpp
index eea6bdb..3956351 100644
--- a/gralloc960/mali_gralloc_module.cpp
+++ b/gralloc960/mali_gralloc_module.cpp
@@ -20,7 +20,7 @@
#include <pthread.h>
#include <inttypes.h>
-#include <cutils/log.h>
+#include <log/log.h>
#include <cutils/atomic.h>
#include <hardware/hardware.h>
#include <hardware/fb.h>