am 4a8c0950: Merge "Do not use color EGLimages as depth or stencil images or vice...
authorJarkko Pöyry <jpoyry@google.com>
Mon, 11 Jan 2016 19:32:42 +0000 (19:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:32:42 +0000 (19:32 +0000)
am: 23c8c90b47

* commit '23c8c90b472f82f9c028a27ed777aae7a581071c':


Trivial merge