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

Change-Id: Iaab965ccbaeb3ca315a5da67ae342b25b1fccb35


Trivial merge