Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Fri, 11 Nov 2016 22:53:05 +0000 (14:53 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 11 Nov 2016 22:53:05 +0000 (14:53 -0800)
commitf040b902c051e2d78b41c0153961a2a0f8ee232e
tree4ba4ea441500ee34b0f5173446420cd8762ccef4
parentde34fad51cc07daf1eed73fc35e4cd5bf79b1a5c
parent53331f8a91b6ab5f6ea57707620c92435bc06dde
Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev

Change-Id: Ie87a52c0ab42568cb0e7d8761d8b717c6670b158