Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 27 Jul 2018 16:33:15 +0000 (09:33 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 27 Jul 2018 16:33:15 +0000 (09:33 -0700)
commit6e8225079dcdb5ed514535ca33dabbcc04566e9a
tree4873a504f571cb51141d699a97b68d41568485aa
parent4e1e1697c0d5c137a1a67cfe10df7881f2f8b39b
parentdf3b18b4248a2ea02362ea87eae5d4f2f8bec0e2
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: Ie2f5d01b30f9c10b0081b4d784d3c6fcbb72eb63