Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:08:05 +0000 (16:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:08:05 +0000 (16:08 +0000)
commita4cc4809f6a2a67d988e825b8503158be030f780
treef72e0033d1ed399264952ba7f1b52a8a91f34da1
parent517bd386a5eed60a9bde20516e25caa2a57b5100
parent18231b0d341857591d683b9b587513ce262c81a2
Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 90e6678bc9  -s ours
am: 18231b0d34  -s ours

Change-Id: I822a97a1a29f7dfd3525c9671b405fd0561d7834