Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:17:03 +0000 (16:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:17:03 +0000 (16:17 +0000)
commit57813e1f2a0ae443bfdeb06b5cb7682adc156768
treea04a7ca18948fbdaef7cd164a6316aa2205335a6
parentf2e98c7d7dfb9614a3a0d6a5f2f47eddadc94a9e
parent74bc88be3278cd43238d3bace0cd68fef6586f91
Merge "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 am: df2c784664  -s ours" into nyc-mr2-dev-plus-aosp
am: 74bc88be32  -s ours

Change-Id: I9642121a3fa570ec74ae191ee047c85d447a1afa