Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:03:19 +0000 (16:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:03:19 +0000 (16:03 +0000)
commit90e6678bc9b4b50e31e3e9ba641a76187d66599d
treeb2d3b565c0f820812bc086128a68dc031e6b6e01
parent2585331908b2a25be0316cdf336306a06accea5f
parent9a83ec3f47230d4c1d47223fc96d1c478a2a40f4
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev
am: 9a83ec3f47

Change-Id: I1dfb480ed3b5fb7f384a8fe9b0a852134fde1500