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


Trivial merge