resolve merge conflicts of 7782ec5b to deqp-dev
authorMika Isojärvi <misojarvi@google.com>
Fri, 14 Jul 2017 19:46:08 +0000 (12:46 -0700)
committerMika Isojärvi <misojarvi@google.com>
Fri, 14 Jul 2017 19:46:08 +0000 (12:46 -0700)
commitd14f89685a8f4d7c6b07d59e1f5d1f0cee22d185
treef201848a88c3378bf78d6d8cd90a1df7dc4a3c45
parentc5bdb9547318b18bffcb5c75f1d87b73591504c6
parent7782ec5bab873e06201d4d775f628c6fe6e891ed
resolve merge conflicts of 7782ec5b to deqp-dev

Test: Build the apk and ran scripts/check_build_sanity.p.
Change-Id: I0ac3ec6a73a4751bd5b075aaf59bb24c48f14f5c
13 files changed:
framework/opengl/gluCallLogWrapper.inl
framework/opengl/gluCallLogWrapperApi.inl
framework/opengl/wrapper/glwApi.inl
framework/opengl/wrapper/glwEnums.inl
framework/opengl/wrapper/glwFunctionTypes.inl
framework/opengl/wrapper/glwFunctions.inl
framework/opengl/wrapper/glwImpl.inl
framework/opengl/wrapper/glwInitExtES.inl
framework/opengl/wrapper/glwInitExtGL.inl
framework/opengl/wrapper/glwVersions.inl
framework/platform/null/tcuNullRenderContextFuncs.inl
framework/platform/null/tcuNullRenderContextInitFuncs.inl
scripts/opengl/src_util.py