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

Change-Id: Ibf415e822ead5d6498b0e1d940baaf0aa545be25


Trivial merge