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

Change-Id: I275becb76aef6cb3bf219bc438aa8ee5b012c73b


Trivial merge