Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 20:32:02 +0000 (20:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:32:02 +0000 (20:32 +0000)
commit2c6307af33cac763272092a807199428475ae9d1
tree90015cc1f592ba2e1461083d9e88ec0731cd2a8f
parent7bab558fb8139f2356aba894231a3a6f87d1bde8
parent1d2a0099797acc8287932d3aed1dc56f30987982
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf  -s ours
am: 1d2a009979  -s ours

Change-Id: Ie406079ab3058b2203dbb3811194c086a595f858