Merge vk-gl-cts-public/master into aosp/deqp-dev
authorMika Isojärvi <misojarvi@google.com>
Mon, 7 Aug 2017 21:32:43 +0000 (14:32 -0700)
committerMika Isojärvi <misojarvi@google.com>
Mon, 7 Aug 2017 21:42:40 +0000 (14:42 -0700)
commitf547ed73758295671c37bdf603a28953c6ec42f8
tree97663ac773f37450a47825dd5c94791a53d8c1ef
parent1150f436202ceafbc3da9d4f635a32ac53233050
parent9b0f8d4dd559ee390de97b5a4aed622ef1b66d8c
Merge vk-gl-cts-public/master into aosp/deqp-dev

Change-Id: I48249f54d401d1dc8668690f9f30c6d5f57ab642
AndroidGen.mk
external/vulkancts/modules/vulkan/api/CMakeLists.txt
framework/egl/wrapper/eglwEnums.inl
framework/egl/wrapper/eglwEnumsC.inl
scripts/egl/common.py