Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 ...
authorPyry Haulos <phaulos@google.com>
Fri, 20 Jan 2017 20:58:40 +0000 (20:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:58:40 +0000 (20:58 +0000)
am: 3b908a5583  -s ours

Change-Id: Iffc1781093fb35750d0b6d443a46bc5748445ab8


Trivial merge