Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:09:13 +0000 (16:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:09:13 +0000 (16:09 +0000)
commit4f2accd1217a4fac8af22b51b616baf571de50e0
tree2f29fc243388d26a4fe277d6c0e6e6342f085e9c
parente63231fb5e1ce823306a34e76b612aea67469437
parent26ff3a55fd97ae79712fbe6b95efcd4199c1f31a
Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 90e6678bc9" into nyc-mr1-dev
am: 26ff3a55fd

Change-Id: I546fb08c2c59d10ca3a95fd2307251e11d72623e