Merge "Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690...
authorPyry Haulos <phaulos@google.com>
Fri, 20 Jan 2017 20:58:44 +0000 (20:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:58:44 +0000 (20:58 +0000)
commit7023b4e3dd6a035b7393a647e631668b1645c332
tree3562490f32f31ee5aa01414399d9be8379dfd570
parent6b37ec23828f633c6a7d7442a718439b8e725a11
parent9f321a7874098c3f5ade139937f408354b264fe3
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690  -s ours am: 55fe6e8997  -s ours am: 7bab558fb8  -s ours" into nyc-mr1-dev-plus-aosp am: a185466ba9  -s ours" into nyc-mr2-dev-plus-aosp
am: 9f321a7874  -s ours

Change-Id: I275becb76aef6cb3bf219bc438aa8ee5b012c73b