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

Change-Id: I4ac46de2204b02939b22b35572c7c6561364b18a


Trivial merge