Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:16:22 +0000 (16:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:16:22 +0000 (16:16 +0000)
commit6ffb112b5326484880add5df44399e8881f794e0
treeaa5c258b22f4d983054cc158e1938727ac098f62
parent7782da8bc69dc1b044c15b3d7787cbec308bdb81
parentc99530440b9038d1424fd3372a1913763b9343ea
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 9443c9c4c0 am: 578ae6d230 am: 6b5103682e am: 28cc3b34a9
am: c99530440b  -s ours

Change-Id: I6e05166299ac00d164e4a446a3994126f99d8d3f