Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:09:13 +0000 (16:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:09:13 +0000 (16:09 +0000)
am: 26ff3a55fd

Change-Id: I546fb08c2c59d10ca3a95fd2307251e11d72623e


Trivial merge