Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 20:59:10 +0000 (20:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:59:10 +0000 (20:59 +0000)
am: 85830e3e45  -s ours

Change-Id: I6894e5f90b2c57d43a36896da8a388e43702ac36


Trivial merge