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

Change-Id: I18cb5efebe1ed2b56818fc2c5b8da89f0a4fd1d7


Trivial merge