Merge deqp-dev into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Fri, 17 Mar 2017 21:56:45 +0000 (14:56 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 17 Mar 2017 21:56:45 +0000 (14:56 -0700)
commitc9fc3de3705f34f62d02dfd97bdbb1d6b5cf4b1b
tree72da07f2d6af1ef5957487cb9860e35cdfad4db0
parent645b5c6de148237b3eed0a95f2e4644033e2bad4
parent85e76dc36e8683351db8ec59f42fb252c6ece8de
Merge deqp-dev into vk-gl-cts/master

Change-Id: I8b14ed1eff819165824b6737c11128ae7f12cd5c
AndroidGen.mk
android/cts/master/gles31-master.txt
modules/gles31/functional/es31fDebugTests.cpp
modules/gles31/functional/es31fFunctionalTests.cpp
modules/gles31/functional/es31fNegativeTextureApiTests.cpp
modules/gles31/functional/es31fPrimitiveBoundingBoxTests.cpp