Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 18:47:15 +0000 (18:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 18:47:15 +0000 (18:47 +0000)
commit011ccfc1347d79699a6f82ce0452219414363ae9
tree45da1a6af67cd2516cac7239f29c10b84c44814d
parent2ecead38c4e0ef1e8afe8744c5b972931860faa7
parent4ac909cfeb619f6ca5648fb2c872e9e5f0ec862c
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: ce3144c3e5 am: 29dde7d04d
am: 4ac909cfeb

Change-Id: If70fa0b064ecfe16aa2090c36981df138d03119f