Merge vk-gl-cts/aosp-master into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Wed, 8 Mar 2017 23:10:14 +0000 (15:10 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 8 Mar 2017 23:24:24 +0000 (15:24 -0800)
commit2b5c5f1ddc8038b0e7150d87ed7894f64af8da3d
tree157a366d83f50374cd00f7a83b74d9c16a7c191f
parent219019495770c221e92f43df3e76a954c613210d
parentc9dcf19f733f40a7c20ef6474f2b416243954fe3
Merge vk-gl-cts/aosp-master into vk-gl-cts/master

Components: AOSP, Framework

Change-Id: I0de6207abfc1c990a85fcf977d78ed1103c52a1b
13 files changed:
Android.mk
AndroidGen.mk
android/cts/master/egl-master.txt
android/cts/master/gles31-master.txt
android/scripts/build.py
android/scripts/common.py
framework/opengl/gluStrUtil.inl
framework/opengl/gluStrUtilPrototypes.inl
modules/gles31/functional/es31fCopyImageTests.cpp
modules/gles31/functional/es31fFunctionalTests.cpp
modules/gles31/functional/es31fNegativeTextureApiTests.cpp
modules/gles31/functional/es31fSynchronizationTests.cpp
scripts/build_android_mustpass.py