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

Change-Id: I50ce03149d8ca74ed207910688f1ec4652e9e3db


Trivial merge