Merge vk-gl-cts/aosp-deqp-dev into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Mon, 5 Jun 2017 17:37:17 +0000 (10:37 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 5 Jun 2017 17:37:17 +0000 (10:37 -0700)
commit531022fed8a7742adaefbdb35028812e7a520f0b
tree964d8fbee8e0ea593eb6502f12304534048cb849
parent19b3f790b9c3cf7f62090b4f14c53640048d1dde
parent428a2256159883c651a409c4e0cbe031953f4c4e
Merge vk-gl-cts/aosp-deqp-dev into vk-gl-cts/master

Change-Id: Ib189ff26f3bb7e049f5e0c4345e523cc39e91d4f