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

Change-Id: I03190aa34e911cb4a8b174d1251a354ff6e34718


Trivial merge