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

Change-Id: I7bfd9c1447e4540c39f4e02e560eff2a46b94a72


Trivial merge