Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:11:11 +0000 (20:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:11:11 +0000 (20:11 +0000)
am: b63867c2a7  -s ours

Change-Id: I6501fbc0c7bb67914bb95033a7395b22762ada39


Trivial merge