Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:06:57 +0000 (16:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:06:57 +0000 (16:06 +0000)
am: 90e6678bc9

Change-Id: I06a9f451d5ba510d77b89c01dbe33229bbd75319


Trivial merge