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

Change-Id: Ib0cc75a3fd6f67f88dc584da02cebc8aaac6327b


Trivial merge