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

Change-Id: I30320577a9c755ac3c437c8bcc967b20b254652b


Trivial merge