Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am...
authorPyry Haulos <phaulos@google.com>
Fri, 20 Jan 2017 20:57:17 +0000 (20:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:57:17 +0000 (20:57 +0000)
commite553090f6aedbef9d698a7e8cfe0a27ad4fa9030
tree3562490f32f31ee5aa01414399d9be8379dfd570
parent147a43941b8118bd3f6cad5450599fa078b899fb
parent0814dedc8b0471f0c449aed95dee8f76ca6bb071
Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am: e4ed95024e am: 578afa4c88 am: 22a8808370 am: 7b177f2f34 am: 3665d90d07  -s ours" into nyc-mr2-dev-plus-aosp
am: 0814dedc8b  -s ours

Change-Id: I28a1e7d6667d2101ffd9ee6023775ac7fcb63b1d