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

Change-Id: I7eb3481b4c93bcc4de011b97739f829dcfa77d56


Trivial merge