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

Change-Id: Ie1f567d1163b2608d0c78ccc65be46b6f55fad1f


Trivial merge