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

Change-Id: I680b60f009e8697ea0d67409d1e07456e367f2ef


Trivial merge