Merge "Select shader version appropriate for context." into gles32-dev
authorPyry Haulos <phaulos@google.com>
Mon, 8 Feb 2016 23:06:23 +0000 (23:06 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 8 Feb 2016 23:06:23 +0000 (23:06 +0000)

Trivial merge