am a69003b7: Merge "Allow XXX_framebuffer_no_attachments limits to exceed texture...
authorJarkko Pöyry <jpoyry@google.com>
Mon, 11 Jan 2016 19:36:10 +0000 (19:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:36:10 +0000 (19:36 +0000)
am: 2ff0cb3d8c

* commit '2ff0cb3d8c1f7c57671de21a29c57ab3260ae5ff':


Trivial merge