diff options
| author | 2017-01-12 08:35:35 -0800 | |
|---|---|---|
| committer | 2017-01-12 08:36:11 -0800 | |
| commit | e0ea99cc4ba89452b9b6b1baa33bddcb11f3351a (patch) | |
| tree | 1c90d7dda6cbd815a854cd35432d43064d2e1daa /services/surfaceflinger/SurfaceFlinger.cpp | |
| parent | ba4d92cc90b5d2a902e898211f04311a0ae2493b (diff) | |
| parent | a2c2d11f98b692401be56c8f285c570bae47ddda (diff) | |
resolve merge conflicts of a2c2d11f9 to master
Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I84d0ffa430df3beca0dcc6ed205ce220d7be1f87
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 193b702dec..db6b366786 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -28,8 +28,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> |