Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 18:11:52 +0000 (18:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 18:11:52 +0000 (18:11 +0000)
commit20bc7ec0078cc7fa13c90199b49f48806b686f40
tree42f46eb7c4d33adfad9baf71c3975d9ac723716c
parentdc6a6f466e69368ee78fae9337ea86c30f7317ee
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: I4ac46de2204b02939b22b35572c7c6561364b18a