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

Change-Id: Ibd8f506fdc2fceebec11a44466719a10a8e0b785


Trivial merge