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)
commit9443c9c4c0670d6a0ac13bcc12f5cd0950bf2421
treed090697b80239fe81100b2cba3f97d373dba4dd8
parent71a9bc447deafbf9d091a87530b320db7c2cdb9c
parent9a83ec3f47230d4c1d47223fc96d1c478a2a40f4
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev
am: 9a83ec3f47

Change-Id: I18cb5efebe1ed2b56818fc2c5b8da89f0a4fd1d7