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

Change-Id: I960ebd58ca15845cc3c6949bcce3111a0a6128f3


Trivial merge