Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 20:59:35 +0000 (20:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:59:35 +0000 (20:59 +0000)
am: 731f55380c  -s ours

Change-Id: I67875ae50bbb82539fcbc9f38cc1d92e3b3c98d5


Trivial merge