Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 18:42:40 +0000 (18:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 18:42:40 +0000 (18:42 +0000)
commit4ac909cfeb619f6ca5648fb2c872e9e5f0ec862c
tree45da1a6af67cd2516cac7239f29c10b84c44814d
parent20860eb2df2e0d85f3ca30b261cdd55712cbdc73
parent29dde7d04d19251dffe94b26d95234ee119b195f
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: ce3144c3e5
am: 29dde7d04d

Change-Id: I10a70e9f1062c171f86e0a751aca1a9f61af5cb6