Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 18:04:38 +0000 (18:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 18:04:38 +0000 (18:04 +0000)
am: c99530440b

Change-Id: I97eba377b795020191d0cfccee80f33188eb9ac2


Trivial merge