Merge "Update test to dynamically select shader version based on context." into gles3...
authorPyry Haulos <phaulos@google.com>
Mon, 22 Feb 2016 16:52:44 +0000 (16:52 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 22 Feb 2016 16:52:44 +0000 (16:52 +0000)

Trivial merge