Merge ShaderRenderCase tests
authorPyry Haulos <phaulos@google.com>
Sat, 12 Dec 2015 00:12:36 +0000 (16:12 -0800)
committerPyry Haulos <phaulos@google.com>
Sat, 12 Dec 2015 00:12:36 +0000 (16:12 -0800)

Trivial merge