Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:18:26 +0000 (20:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:18:26 +0000 (20:18 +0000)
am: 24371c5d2d  -s ours

Change-Id: I62879bb73f6dda65caa1b16b6be6c8d212eb3ac4


Trivial merge