Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 20:46:02 +0000 (20:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:46:02 +0000 (20:46 +0000)
commitf215c5ffab623d5fb20d1482c8200ce8c7050c21
tree3562490f32f31ee5aa01414399d9be8379dfd570
parent5278ffdd2a005150948a6b314cef6ebf0626569f
parent5653120f844602a0233480a4a0c947711bb1cf31
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: ce3144c3e5 am: 29dde7d04d am: 4ac909cfeb am: 011ccfc134  -s ours
am: 5653120f84  -s ours

Change-Id: I902e942aba6d8db4b856a81ac6d6f42b382cc488