Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 20:07:19 +0000 (20:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:07:19 +0000 (20:07 +0000)
am: e553090f6a  -s ours

Change-Id: Ie51159d7cdb90ffe8f3ef41be3b6e5295f041f6a


Trivial merge