Merge "Select appropriate version for running context." into gles32-dev
authorPyry Haulos <phaulos@google.com>
Wed, 24 Feb 2016 22:15:42 +0000 (22:15 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 24 Feb 2016 22:15:42 +0000 (22:15 +0000)

Trivial merge