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:35:53 +0000 (19:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:35:53 +0000 (19:35 +0000)
am: 9cc029ef54

* commit '9cc029ef540d82f63bc4b04d3ab8fc34dd074bd1':


Trivial merge