am a69003b7: Merge "Allow XXX_framebuffer_no_attachments limits to exceed texture...
authorJarkko Pöyry <jpoyry@google.com>
Wed, 10 Jun 2015 15:52:29 +0000 (15:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Jun 2015 15:52:29 +0000 (15:52 +0000)
commit2ff0cb3d8c1f7c57671de21a29c57ab3260ae5ff
treeef0ee774e4a41efa006d18a8b5e35b56a46f8116
parentc71de18307ef4a04c201fe1a23d99280539bc44f
parenta69003b79f317822a2bbe1f804b425ca00998a2e
am a69003b7: Merge "Allow XXX_framebuffer_no_attachments limits to exceed texture limits." into mnc-dev

* commit 'a69003b79f317822a2bbe1f804b425ca00998a2e':
  Allow XXX_framebuffer_no_attachments limits to exceed texture limits.