diff options
author | Mark Salyzyn <salyzyn@google.com> | 2017-01-12 15:59:48 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-01-12 15:59:48 +0000 |
commit | ec7e2a164c3792fbaab74f6a9eab7c3cb06296e2 (patch) | |
tree | e95590278fba647ff13b377f4669d408616365b1 /libs/hwui/renderthread/EglManager.cpp | |
parent | 4103219402225588b4d2387a2070d0433d8924b4 (diff) | |
parent | 6dacea63d9923d6f451095b7d7b2f203ba7e960e (diff) |
Merge "Replace cutils/log.h and log/logger.h with android/log.h or log/log.h (part deux)" am: 2225a0640b am: d1740f0f5b
am: 6dacea63d9
Change-Id: Ife229cc450dbbb5f43941fcd1b08b86f0e41a779
Diffstat (limited to 'libs/hwui/renderthread/EglManager.cpp')
-rw-r--r-- | libs/hwui/renderthread/EglManager.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libs/hwui/renderthread/EglManager.cpp b/libs/hwui/renderthread/EglManager.cpp index 86731c9581be..99bc9a75e94b 100644 --- a/libs/hwui/renderthread/EglManager.cpp +++ b/libs/hwui/renderthread/EglManager.cpp @@ -16,16 +16,18 @@ #include "EglManager.h" +#include <string> + +#include "utils/StringUtils.h" +#include <cutils/properties.h> +#include <log/log.h> + #include "Caches.h" #include "DeviceInfo.h" #include "Properties.h" #include "RenderThread.h" #include "renderstate/RenderState.h" -#include "utils/StringUtils.h" -#include <cutils/log.h> -#include <cutils/properties.h> #include <EGL/eglext.h> -#include <string> #define GLES_VERSION 2 |