Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 18:43:17 +0000 (18:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 18:43:17 +0000 (18:43 +0000)
am: 9d74d882df

Change-Id: I2ef1de0e7b4d338fbeee054b1656e2ba004633d4


Trivial merge