Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:08:46 +0000 (16:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:08:46 +0000 (16:08 +0000)
commit6b5103682ec6548e8fa037186b8adde126ec5d78
tree2f29fc243388d26a4fe277d6c0e6e6342f085e9c
parent62aeee5d3ef90a3190dd09581340b07b53444f70
parent578ae6d230c66825ddd550335374ae6f9b9246e9
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 9443c9c4c0
am: 578ae6d230

Change-Id: I36eb3d69950032890a944b6ca326ef9dbcc4221a