Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:07:53 +0000 (20:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:07:53 +0000 (20:07 +0000)
commitb1eb4560f942416dc2adc718ee9383c6d67b69ec
treef83c4ae88105474ccba79791513065abe1ff2c93
parent1aa4ee03241f9ee3d1303d067d982b7eb4b3ee7c
parent742f1b4a4d36386e3dbb317254b9dcc5adda9e18
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
am: 742f1b4a4d  -s ours

Change-Id: Ibd8f506fdc2fceebec11a44466719a10a8e0b785