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

Change-Id: Ic6d2983615eba973b6a12ec9a54509420af1d76d


Trivial merge