Merge "Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 20:09:50 +0000 (20:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:09:50 +0000 (20:09 +0000)
am: 7023b4e3dd  -s ours

Change-Id: I2c4064b7df787b76555a5709a3190a53d9518c26


Trivial merge