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

Change-Id: I6d13dfd8cf3f66075c29f7516efd4fd1e420fb56


Trivial merge