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

Change-Id: I9bf93b4385ceef0db9daba02b32f96061cb9ba74


Trivial merge