Merge "Select appropriate shader version for running context." into gles32-dev
authorPyry Haulos <phaulos@google.com>
Fri, 26 Feb 2016 17:58:45 +0000 (17:58 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 26 Feb 2016 17:58:45 +0000 (17:58 +0000)

Trivial merge