am d34eae8f: am 2ff0cb3d: am a69003b7: Merge "Allow XXX_framebuffer_no_attachments...
authorJarkko Pöyry <jpoyry@google.com>
Wed, 10 Jun 2015 17:25:24 +0000 (17:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Jun 2015 17:25:24 +0000 (17:25 +0000)
* commit 'd34eae8f733a5545a29bfbb5a09b0f243db2bb42':
  Allow XXX_framebuffer_no_attachments limits to exceed texture limits.


Trivial merge