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

Change-Id: I415a1f65dffb0b5d3218653bfd34653535b7081d


Trivial merge