Merge remote-tracking branch 'khronos/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Thu, 22 Feb 2018 18:14:13 +0000 (10:14 -0800)
committerChris Forbes <chrisforbes@google.com>
Thu, 22 Feb 2018 18:14:13 +0000 (10:14 -0800)
commitf8b11dbdb9ca64b0a214b6ae4c0e4ef0eaab9e91
tree763923f4bf807dc201292c7b36beec6468a91e1a
parentefb4eb2f9af9c416a8cbc734975f2af4fadafc98
parent5a7f1e6cbbfb81f7b6f65874fd337a6f71650e6e
Merge remote-tracking branch 'khronos/master' into deqp-dev

Change-Id: Iadea35019f1362e92a5e67ca7383df27cba6d1fd