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

Change-Id: If580320c0105fcc4087ef873f89de3350019c719


Trivial merge