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

Change-Id: I1f9541e557c882d978b2f28ac19d661d966a7fc7


Trivial merge