Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Thu, 29 Mar 2018 20:27:19 +0000 (13:27 -0700)
committerChris Forbes <chrisforbes@google.com>
Thu, 29 Mar 2018 20:27:19 +0000 (13:27 -0700)
commitf665f310b58b832006b7d786bf6b5eb04c0dfad9
treeb94df1a69fea5fadad882c575789efef1e919ca5
parent322567cdc80a107e017344e6b39f453bdea97c46
parentf774a8cd7744fb374b51346a036a16baf084241a
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: I93f0ba87fc282346c4d7bd6b4521b105826328aa