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

Change-Id: I34ffc412dbe315f28cb6e749de45a2d9b0257f3f


Trivial merge