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

Change-Id: Ie48f61086e3b2a54c0ed414a2871497590e2b2fe


Trivial merge