7be3e5d2d8
Conflicts: libs/surfaceflinger/Layer.cpp libs/surfaceflinger/SurfaceFlinger.cpp opengl/libagl/egl.cpp opengl/libs/EGL/egl.cpp opengl/libs/GLES_CM/gl.cpp opengl/libs/GLES_CM/gl_api.in opengl/libs/gl_entries.in opengl/libs/tools/glapigen |
||
---|---|---|
.. | ||
EGL | ||
GLES_CM | ||
tools | ||
Android.mk | ||
egl_entries.in | ||
egl_impl.h | ||
gl_entries.in | ||
gl_enums.in | ||
glext_entries.in | ||
hooks.h |