Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 19:48:03 +0000 (19:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:48:03 +0000 (19:48 +0000)
am: 421ec17515  -s ours

Change-Id: I6430248b72b92f18c60e80a5007bc16cfe0fe8d6


Trivial merge