Merge "Fix GL_COMPRESSED_TEXTURE_FORMATS query in null context"
authorPyry Haulos <phaulos@google.com>
Thu, 21 Jan 2016 00:49:09 +0000 (00:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jan 2016 00:49:09 +0000 (00:49 +0000)
commita253499ac4b6ad89384644f657ab943a9339a742
treee66afcaed3bdeb5e73ecbc0eeac7818a5e671a81
parent1a24ecf6b3e376d8d62e744bf6afc374a1310063
parentde4024033762387017efdec7532d2358990261eb
Merge "Fix GL_COMPRESSED_TEXTURE_FORMATS query in null context"
am: de40240337

* commit 'de4024033762387017efdec7532d2358990261eb':
  Fix GL_COMPRESSED_TEXTURE_FORMATS query in null context