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

Change-Id: I1b74a38daa13ae6add928adc15f8cbeb894d9b97


Trivial merge