Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 18:32:56 +0000 (18:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 18:32:56 +0000 (18:32 +0000)
am: e98444b9bf

Change-Id: I7dd94e3a7648f0f1d80e914ca97b7e9a32ca29e4


Trivial merge