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

Change-Id: I4d503963d75b7eac201c3735940f953f72720a06


Trivial merge