diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2017-01-12 08:27:11 -0800 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2017-01-12 08:28:30 -0800 |
| commit | 173215d1b20b70908a9d1807f1372bd95b7ad5f1 (patch) | |
| tree | f9dd70a25c2ca5ae7c766dd5615b1f7af5af3f3e /libs/hwui/renderthread/EglManager.cpp | |
| parent | e86e6d75959787389fcc9b51082b0f33c4553fcd (diff) | |
| parent | ec7e2a164c3792fbaab74f6a9eab7c3cb06296e2 (diff) | |
resolve merge conflicts of ec7e2a164c37 to master
Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I49c6e41b79061e2b3c0352e3ac8fa5ebb152b6f5
Diffstat (limited to 'libs/hwui/renderthread/EglManager.cpp')
| -rw-r--r-- | libs/hwui/renderthread/EglManager.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libs/hwui/renderthread/EglManager.cpp b/libs/hwui/renderthread/EglManager.cpp index 02021fce680b..7020be073ee0 100644 --- a/libs/hwui/renderthread/EglManager.cpp +++ b/libs/hwui/renderthread/EglManager.cpp @@ -16,20 +16,23 @@ #include "EglManager.h" -#include "Texture.h" +#include <string> + +#include "utils/StringUtils.h" +#include <cutils/properties.h> +#include <log/log.h> + #include "Caches.h" #include "DeviceInfo.h" #include "Frame.h" #include "Properties.h" #include "RenderThread.h" #include "renderstate/RenderState.h" -#include "utils/StringUtils.h" -#include <cutils/log.h> -#include <cutils/properties.h> +#include "Texture.h" + #include <EGL/eglext.h> #include <GrContextOptions.h> #include <gl/GrGLInterface.h> -#include <string> #ifdef HWUI_GLES_WRAP_ENABLED #include "debug/GlesDriver.h" |