Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:05:58 +0000 (16:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:05:58 +0000 (16:05 +0000)
commit18231b0d341857591d683b9b587513ce262c81a2
treeaa5c258b22f4d983054cc158e1938727ac098f62
parent0543f8e6194482d65c97f353c7e1681ddd27813d
parent90e6678bc9b4b50e31e3e9ba641a76187d66599d
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47
am: 90e6678bc9  -s ours

Change-Id: I157b06b418801793909c853f0e3f51c574283d15