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

Change-Id: Iae5a5d85e038713c00f6a3267551b9abac2c7f93


Trivial merge