Merge "Select appropriate shader version for running context." into gles32-dev
authorPyry Haulos <phaulos@google.com>
Thu, 25 Feb 2016 22:19:49 +0000 (22:19 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 25 Feb 2016 22:19:49 +0000 (22:19 +0000)

Trivial merge