Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 18:07:19 +0000 (18:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 18:07:19 +0000 (18:07 +0000)
am: a651781bb8  -s ours

Change-Id: I834a7749709c083b972a23fadfc934d74b20951f


Trivial merge