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

Change-Id: I704816838b9336c1a14599a4dd5d541cd91169ce


Trivial merge