Merge branch 'cts_mlentine' into 'master'
authorPyry Haulos <phaulos@google.com>
Wed, 25 Nov 2015 01:57:43 +0000 (20:57 -0500)
committerPyry Haulos <phaulos@google.com>
Wed, 25 Nov 2015 01:57:43 +0000 (20:57 -0500)
Fix sType for vertex assembly in object management tests.

See merge request !77


Trivial merge