Merge "Add support for ES 3.2." into gles32-dev
authorPyry Haulos <phaulos@google.com>
Thu, 25 Feb 2016 22:20:13 +0000 (22:20 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 25 Feb 2016 22:20:13 +0000 (22:20 +0000)

Trivial merge