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

Change-Id: If70fa0b064ecfe16aa2090c36981df138d03119f


Trivial merge