Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 20:46:40 +0000 (20:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:46:40 +0000 (20:46 +0000)
commitfc588a028189b52f00fc969f126a5d1ae66c54e8
tree90015cc1f592ba2e1461083d9e88ec0731cd2a8f
parent22f1c94794762a4872f69f3b80f26034d660ec8c
parent50df351a0f561c5f3ffa04ac8507b5215c66cbd5
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

Change-Id: I4fe705ee4db0cb5b1e5c27331aa1cd703c90e34a