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

* commit 'cdfe4e636cc3d44a7b678170c29d995c4dd9b849':


Trivial merge