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

Change-Id: I28a1e7d6667d2101ffd9ee6023775ac7fcb63b1d


Trivial merge