Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 20:17:46 +0000 (20:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:17:46 +0000 (20:17 +0000)
commit8283247ae493735c8eb61f02698e4f80678505f6
treef83c4ae88105474ccba79791513065abe1ff2c93
parent78dc5c20e0eea97017ede95482e8deba589fddec
parent0a4421278693bd056848540806168014537ca9ca
Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690 am: 0004ce1767 am: ee2a180f00 am: 20860eb2df  -s ours am: a4982bfb72  -s ours" into nyc-mr2-dev-plus-aosp am: 4b45e7bd91  -s ours
am: 0a44212786  -s ours

Change-Id: Ic6d2983615eba973b6a12ec9a54509420af1d76d