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)
commit18bcd1b13eba56e5a7d6e47d0eac7eed7a59f344
treef83c4ae88105474ccba79791513065abe1ff2c93
parentca3f4d1600237f9c5f23fbbf3d255dcdac59bca3
parent421ec1751532071bf61a3943cc322f5931a1d7d8
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am: e98444b9bf am: ce3144c3e5 am: 29dde7d04d am: 4ac909cfeb am: 011ccfc134  -s ours" into nyc-mr2-dev-plus-aosp am: f5600f9aaf  -s ours
am: 421ec17515  -s ours

Change-Id: I6430248b72b92f18c60e80a5007bc16cfe0fe8d6