Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat...
authorPyry Haulos <phaulos@google.com>
Wed, 3 May 2017 16:14:15 +0000 (16:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 16:14:15 +0000 (16:14 +0000)
commit5de88a4102574eb56307911c901ecee64a66062d
treeaa5c258b22f4d983054cc158e1938727ac098f62
parentcd4fa87630c95e569a3414c29d0ec69298d680fb
parenteb48f49ddca2af68c2a7a55c58c68106813df33b
Merge "Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts-dev am: 9a83ec3f47 am: 90e6678bc9" into nyc-mr1-dev am: 26ff3a55fd am: 4f2accd121
am: eb48f49ddc  -s ours

Change-Id: Ib55e83cc935c9e921f7511534af7a5d3649a9eac