Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:11:39 +0000 (20:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:11:39 +0000 (20:11 +0000)
commit43c45a2a1a5f31b55f3c074d1a7dba26a69fe50d
treef83c4ae88105474ccba79791513065abe1ff2c93
parent3be099e4c00118842a236839a9558b27459f77c6
parentcfaa19e31cd6703633d9c5b0f472fcab67a18c62
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" into nyc-mr1-dev-plus-aosp am: cf38dd18f9  -s ours am: 731f55380c  -s ours
am: cfaa19e31c  -s ours

Change-Id: Ie1f567d1163b2608d0c78ccc65be46b6f55fad1f