Merge "Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture"...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:20:50 +0000 (16:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:20:50 +0000 (16:20 +0000)
am: 2d576a8876  -s ours

Change-Id: I82866cc719b3f93f8e3d5f3e733b150d4d07edf4


Trivial merge