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

Change-Id: I5e698854a23f2a0a7e93c357affe0f40f7bf9366


Trivial merge