Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Thu, 21 Mar 2019 20:59:49 +0000 (13:59 -0700)
committerChris Forbes <chrisforbes@google.com>
Thu, 21 Mar 2019 21:23:25 +0000 (21:23 +0000)
Change-Id: Id1dbec36bea53236bcb7f4fc997a3e2b7b9c832a


Trivial merge