Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am...
authorPyry Haulos <phaulos@google.com>
Fri, 20 Jan 2017 20:45:36 +0000 (20:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:45:36 +0000 (20:45 +0000)
commit5278ffdd2a005150948a6b314cef6ebf0626569f
tree3562490f32f31ee5aa01414399d9be8379dfd570
parentac7365be3d8063d5cee1af3c34f41c35ce1f1550
parent76768aa15e0b6b7a58eeb38c81210341112ff328
Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am: 0004ce1767 am: ee2a180f00 am: 20860eb2df am: 2ecead38c4  -s ours" into nyc-mr2-dev-plus-aosp
am: 76768aa15e  -s ours

Change-Id: Ie48f61086e3b2a54c0ed414a2871497590e2b2fe