projects / platform / upstream / VK-GL-CTS.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d410e0b 5afbb26)
Merge remote-tracking branch 'aosp/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Sat, 9 Dec 2017 02:04:07 +0000 (18:04 -0800)
committerChris Forbes <chrisforbes@google.com>
Sat, 9 Dec 2017 02:04:07 +0000 (18:04 -0800)
commitbe9975ed53020fc2b89efeb5a1c1728b546a2b64
tree49e76d032c88bc4193624abb4b92d29e1b16ed44tree | snapshot
parentd410e0b9152936b3f3a3f29c606aa2ce79b1007ecommit | diff
parent5afbb268c48682b098ed31426fdcfa95d246e136commit | diff
Merge remote-tracking branch 'aosp/master' into deqp-dev

 Conflicts:
Android.mk
android/cts/master/src/vk-excluded-tests.txt
android/cts/master/vk-master.txt
modules/glshared/glsBuiltinPrecisionTests.cpp

Change-Id: Ic6d2f5de1465158d9f105f9648f117d7b2b915a6
Android.mk diff1 | diff2 | blob | history
CMakeLists.txt diff1 | diff2 | blob | history
android/package/Android.mk diff1 | diff2 | blob | history
modules/egl/teglWideColorTests.cpp diff1 | diff2 | blob | history
Domain: Graphics System / GL;