Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 ...
authorPyry Haulos <phaulos@google.com>
Fri, 20 Jan 2017 20:58:16 +0000 (20:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:58:16 +0000 (20:58 +0000)
commit50a7d61bbed351932d7ff703defc2cb6873942e0
tree3562490f32f31ee5aa01414399d9be8379dfd570
parent823c4b28f5668fe0bfed007fdd352c4dc7b0ef38
parent00e79d6cb002c6ffaf3ff03d697744e5c40a63e7
Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690  -s ours am: 55fe6e8997  -s ours am: 7bab558fb8  -s ours am: 578e9af267  -s ours" into nyc-mr2-dev-plus-aosp
am: 00e79d6cb0  -s ours

Change-Id: I6d13dfd8cf3f66075c29f7516efd4fd1e420fb56