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

Change-Id: Idf9be0fcc27b856282ef0525fff2ade3667080df


Trivial merge