Merge "Fix GL_COMPRESSED_TEXTURE_FORMATS query in null context"
authorPyry Haulos <phaulos@google.com>
Thu, 21 Jan 2016 00:23:58 +0000 (00:23 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 21 Jan 2016 00:23:58 +0000 (00:23 +0000)

Trivial merge