diff options
author | 2016-12-28 09:28:53 -0800 | |
---|---|---|
committer | 2016-12-28 09:29:20 -0800 | |
commit | c03d283e8b3f830d76dd94822b2a13872c05c730 (patch) | |
tree | 514c1b1518ea1b3b863856857ad1cd79b88d00f1 /opengl/libagl/egl.cpp | |
parent | f38ec8abdf0a77b3e0e58dbc470a52d2f25a5eb4 (diff) | |
parent | 525a5f2da844d1acc9e405fc4935d8a1cb2ece67 (diff) |
resolve merge conflicts of 525a5f2 to master
Test: build
Change-Id: Id1c6d3d9dd158fb086b0d8ab74f7838ef0a51af1
Diffstat (limited to 'opengl/libagl/egl.cpp')
-rw-r--r-- | opengl/libagl/egl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index c1efd1cae6..bb20409819 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -18,16 +18,16 @@ #include <assert.h> #include <atomic> #include <errno.h> -#include <stdlib.h> +#include <fcntl.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> -#include <unistd.h> -#include <fcntl.h> #include <sys/ioctl.h> #include <sys/types.h> #include <sys/mman.h> +#include <unistd.h> -#include <cutils/log.h> +#include <android/log.h> #include <utils/threads.h> #include <ui/ANativeObjectBase.h> |