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

Change-Id: I36eb3d69950032890a944b6ca326ef9dbcc4221a


Trivial merge