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

Change-Id: I1dfb480ed3b5fb7f384a8fe9b0a852134fde1500


Trivial merge