Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 27 Apr 2018 21:50:03 +0000 (14:50 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 27 Apr 2018 21:50:03 +0000 (14:50 -0700)
Change-Id: I7ae8d3a5d6fd711f7dc63c09b0c5d2fde386bb65


Trivial merge