Merge "Support uploading compressed 3D textures in gluTexture."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 17 Apr 2015 21:19:17 +0000 (21:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 17 Apr 2015 21:19:18 +0000 (21:19 +0000)

Trivial merge