Merge \"Allow specifying version when creating OpenGL context\" into nyc-dev
authorMika Isojärvi <misojarvi@google.com>
Mon, 13 Jun 2016 22:33:59 +0000 (22:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 22:33:59 +0000 (22:33 +0000)
am: 6c4da990f4

Change-Id: Idab29565ae74f4dd866205060b76e6146e136e2b


Trivial merge