Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 20:28:13 +0000 (20:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:28:13 +0000 (20:28 +0000)
commit1d2a0099797acc8287932d3aed1dc56f30987982
tree90015cc1f592ba2e1461083d9e88ec0731cd2a8f
parent55fe6e8997ca0f96d855672bb9e3827d53eceb64
parente98444b9bf969fd4f8bb15b62200caacc1783f8b
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev
am: e98444b9bf  -s ours

Change-Id: I35eea6598260946f05bec754e9a627c263cad2f0