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)
am: 28cc3b34a9

Change-Id: Iee8955593b7276884cfdcdb38e14a2acaff8d383


Trivial merge