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

Change-Id: If4e842f041eb09e0b9490944b722fa2f621ddd26


Trivial merge