Merge "Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture"...
authorPyry Haulos <phaulos@google.com>
Thu, 24 Aug 2017 17:49:01 +0000 (17:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:49:01 +0000 (17:49 +0000)
am: 2d576a8876  -s ours

Change-Id: I3ecde15d447b357766f6b75a3eb446722fcb337c


Trivial merge