diff options
| author | 2017-01-12 16:01:35 +0000 | |
|---|---|---|
| committer | 2017-01-12 16:01:35 +0000 | |
| commit | a2c2d11f98b692401be56c8f285c570bae47ddda (patch) | |
| tree | 121324bd98cb08f03e3b101fbfc85693745a9427 /services/surfaceflinger/SurfaceFlinger.cpp | |
| parent | de3d159226fd695219f55e6724c6c308ac0b7b7b (diff) | |
| parent | fbc97581511f1fa6aba808a970afa912706fbdea (diff) | |
Merge "Replace cutils/log.h and rationalize log/log.h and android/log.h" am: d655e61a22 am: 16a30c1ac8
am: fbc9758151
Change-Id: I911936217c6b47f48092319ff66edafaf0f7c395
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 643b13b841..dabece2f22 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -27,8 +27,8 @@ #include <EGL/egl.h> -#include <android/log.h> #include <cutils/properties.h> +#include <log/log.h> #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> |