Merge "Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 18:56:48 +0000 (18:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 18:56:48 +0000 (18:56 +0000)
commita330a6f852dac1bf466a9d32f1fc2dbe558ead9f
tree74bdcc363814cf680b5393f994270c2641ea050c
parentf7258c4ed96213c3fff5d4f9dae65e1cc9d1428a
parentc506612495b112c95c0c44880c199d1b6d18f58b
Merge "Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am: 0991459ed1 am: 0a2fc88750 am: 842ee2b145 am: c9c5b8e584 am: e7ce491cb7" into nyc-mr2-dev-plus-aosp
am: c506612495

Change-Id: I331369c11ebcb20ba3aef5786f94dbfc7df92e15