Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Wed, 26 Dec 2018 23:39:33 +0000 (15:39 -0800)
committerChris Forbes <chrisforbes@google.com>
Wed, 26 Dec 2018 23:39:33 +0000 (15:39 -0800)
Change-Id: Ibacf4a76415fb5cdb0d35506adbae5f6f9e63364


Trivial merge