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)
commitd34eae8f733a5545a29bfbb5a09b0f243db2bb42
tree317687de45c59d8770a3e8738a9c15bafd0db67f
parent895efc738062c952b645a29cbb78682b9fbdacb0
parent2ff0cb3d8c1f7c57671de21a29c57ab3260ae5ff
am 2ff0cb3d: am a69003b7: Merge "Allow XXX_framebuffer_no_attachments limits to exceed texture limits." into mnc-dev

* commit '2ff0cb3d8c1f7c57671de21a29c57ab3260ae5ff':
  Allow XXX_framebuffer_no_attachments limits to exceed texture limits.