Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am...
authorPyry Haulos <phaulos@google.com>
Fri, 20 Jan 2017 21:02:41 +0000 (21:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 21:02:41 +0000 (21:02 +0000)
commit0a4421278693bd056848540806168014537ca9ca
tree3562490f32f31ee5aa01414399d9be8379dfd570
parent46144bbf64701fb547160cc27d8481faace8a04e
parent4b45e7bd911ae632ea9149aca7cf25f0440970ae
Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am: 0004ce1767 am: ee2a180f00 am: 20860eb2df  -s ours am: a4982bfb72  -s ours" into nyc-mr2-dev-plus-aosp
am: 4b45e7bd91  -s ours

Change-Id: I680b60f009e8697ea0d67409d1e07456e367f2ef