Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:11:11 +0000 (20:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:11:11 +0000 (20:11 +0000)
commit3be099e4c00118842a236839a9558b27459f77c6
treef83c4ae88105474ccba79791513065abe1ff2c93
parentf3151c382fef8d440fbc2f8314fe91b3952c5750
parentb63867c2a7770a65b93d426c9641b5d98b3021c1
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf  -s ours am: 1d2a009979  -s ours am: 2c6307af33  -s ours am: 57ac8058b6  -s ours" into nyc-mr2-dev-plus-aosp am: 85830e3e45  -s ours
am: b63867c2a7  -s ours

Change-Id: I6501fbc0c7bb67914bb95033a7395b22762ada39