Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:13:44 +0000 (16:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:13:44 +0000 (16:13 +0000)
commitc99530440b9038d1424fd3372a1913763b9343ea
tree2f29fc243388d26a4fe277d6c0e6e6342f085e9c
parent64598a3e948078371b52be10f8a3c637ebe8ec52
parent28cc3b34a9653c7a48d8ea9051f186a8d7ef9b26
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

Change-Id: Iee8955593b7276884cfdcdb38e14a2acaff8d383