diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-04-07 03:31:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-07 03:31:29 +0000 |
| commit | 6f5d1945a315d0bf1c207e9efabb50aaa3f8acb1 (patch) | |
| tree | 33c930578b1fbde714250e50ffc1d5c412611959 /camera/device/1.0/default/CameraDevice.cpp | |
| parent | 837b40abe297ff3435962f902e06c67013eb50fe (diff) | |
| parent | 4e7a3077309d33a21b08e9380573019cc7a8cffb (diff) | |
Merge "Fix transitive includes." into oc-dev
Diffstat (limited to 'camera/device/1.0/default/CameraDevice.cpp')
| -rw-r--r-- | camera/device/1.0/default/CameraDevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/device/1.0/default/CameraDevice.cpp b/camera/device/1.0/default/CameraDevice.cpp index 877c6e7728..6495f30222 100644 --- a/camera/device/1.0/default/CameraDevice.cpp +++ b/camera/device/1.0/default/CameraDevice.cpp @@ -15,10 +15,10 @@ */ #define LOG_TAG "CamDev@1.0-impl" -#include <utils/Log.h> #include <hardware/camera.h> #include <hardware/gralloc1.h> #include <hidlmemory/mapping.h> +#include <log/log.h> #include <utils/Trace.h> #include "CameraDevice_1_0.h" |