Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 21:10:57 +0000 (21:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 21:10:57 +0000 (21:10 +0000)
commitcc956d5af9b3015458d1285d46eb202e47209dda
tree3562490f32f31ee5aa01414399d9be8379dfd570
parent53e4033507441cc610d77fe90808948acf17e196
parent8b23a3675ec1100b6fee46fdbd6093d7c2e06c33
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: 41c599b77e am: 9d74d882df am: b3182128b8 am: a9eaaaca53  -s ours am: fd5c16b5cc  -s ours
am: 8b23a3675e  -s ours

Change-Id: Ib0cc75a3fd6f67f88dc584da02cebc8aaac6327b