Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 20:35:11 +0000 (20:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:35:11 +0000 (20:35 +0000)
commit57ac8058b6ee9e0f4fcb00a65f9ca4235a6fdba2
tree90015cc1f592ba2e1461083d9e88ec0731cd2a8f
parent578e9af2679d5e89b233432c191b41f3172209f4
parent2c6307af33cac763272092a807199428475ae9d1
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf  -s ours am: 1d2a009979  -s ours
am: 2c6307af33  -s ours

Change-Id: Iecf16e40a8690aa3bd9d4cb8e4ba0cb34bd37558