Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
authorPyry Haulos <phaulos@google.com>
Thu, 24 Aug 2017 17:51:53 +0000 (17:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:51:53 +0000 (17:51 +0000)
commit6dac24b87723d7e51a2c94be9da1f1e126a370c4
treeaad755add28ec91c80292ca2400259fdc25363f0
parent8727c5fa014003a4b233061b1a4ebc6505d4c6e4
parentd57f61995e7ff26527fded664220321b86644ea9
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
am: d57f61995e  -s ours

Change-Id: Icd222f4fe4741e5961af3ea51e064b6c4e84c3b2