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

Change-Id: I19a3328f9348fa0ec0faccb54e518d3f6df4d6be


Trivial merge