Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
authorPyry Haulos <phaulos@google.com>
Thu, 24 Aug 2017 17:51:53 +0000 (17:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:51:53 +0000 (17:51 +0000)
am: d57f61995e  -s ours

Change-Id: Icd222f4fe4741e5961af3ea51e064b6c4e84c3b2


Trivial merge