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

Change-Id: Idf2c88674a7adbe4e96f7ae01b17bbc5b2980be2


Trivial merge