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

Change-Id: I902e942aba6d8db4b856a81ac6d6f42b382cc488


Trivial merge