Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Thu, 5 Apr 2018 17:24:12 +0000 (10:24 -0700)
committerChris Forbes <chrisforbes@google.com>
Thu, 5 Apr 2018 17:24:12 +0000 (10:24 -0700)
Change-Id: Ib9e725f708993d7561a5251d4d3d3e8aa982bc00


Trivial merge