Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 20:57:49 +0000 (20:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:57:49 +0000 (20:57 +0000)
commit742f1b4a4d36386e3dbb317254b9dcc5adda9e18
tree3562490f32f31ee5aa01414399d9be8379dfd570
parent68064c940c51bb9cb991dd235243f0b92db99bc7
parent1a7a472c4676079fb7681a451f89abac679947c5
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: 41c599b77e am: 9d74d882df am: b3182128b8 am: a9eaaaca53 am: c0d6b5c22b  -s ours" into nyc-mr2-dev-plus-aosp
am: 1a7a472c46  -s ours

Change-Id: I6821e3a4efc0d2febfb7bd2bf39e3d732ff4bf14