Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:11:34 +0000 (16:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:11:34 +0000 (16:11 +0000)
commitdf2c784664adc254a2e0e8412facddd6d95c0244
treeaa5c258b22f4d983054cc158e1938727ac098f62
parent261a03ba312b25df0211b8b1c49f4cd863321841
parent18231b0d341857591d683b9b587513ce262c81a2
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 90e6678bc9  -s ours
am: 18231b0d34  -s ours

Change-Id: Icb4d6d9b23cbb19186192b5219f310c157e97922