Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:18:44 +0000 (20:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:18:44 +0000 (20:18 +0000)
commit6493f65717a0e7861518d28f0fbf40c1ec8da524
treef83c4ae88105474ccba79791513065abe1ff2c93
parentb6576ced17be0dc4f843a76416680ce885e0c76a
parentf870fb12f7d2cfdde5ba4761895d0c58a6fdaeb4
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: ce3144c3e5 am: 29dde7d04d am: 4ac909cfeb  -s ours am: 50df351a0f  -s ours" into nyc-mr2-dev-plus-aosp am: 37b8c78167  -s ours
am: f870fb12f7  -s ours

Change-Id: Ic4ee609ee486d52df4e1168c2010018d9d28c7ff