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

Change-Id: I157b06b418801793909c853f0e3f51c574283d15


Trivial merge