Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 18:07:19 +0000 (18:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 18:07:19 +0000 (18:07 +0000)
commitd57f61995e7ff26527fded664220321b86644ea9
tree26a81b3d13bdfd830129f0e252f22c8cc7827765
parentdcb6d80d7aa8923c5586487af0dcd0e4745ef04c
parenta651781bb8200c7b8726b6144f66249a417580a7
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
am: a651781bb8  -s ours

Change-Id: I834a7749709c083b972a23fadfc934d74b20951f