Merge "Merge "Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_textur...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:21:25 +0000 (16:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:21:25 +0000 (16:21 +0000)
am: b8886e0cec  -s ours

Change-Id: I03e60ccdaf3ab28915a200357929eec2e8761f9e


Trivial merge