Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 20:43:38 +0000 (20:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:43:38 +0000 (20:43 +0000)
commitfd5c16b5cc95ff703b46fb3bb9cde58986266e2e
tree90015cc1f592ba2e1461083d9e88ec0731cd2a8f
parentd8fcc999460b06c5aa8f2ef1a2a49e05c4643026
parenta9eaaaca537d0c4de80bae36090aac7bc017d1d8
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

Change-Id: I1f9541e557c882d978b2f28ac19d661d966a7fc7