Merge "Drop incorrect framebuffer texture subtests. am: 625d685874 am: 25b6d76b01...
authorKenneth Graunke <kenneth.w.graunke@intel.com>
Fri, 20 Jan 2017 20:53:40 +0000 (20:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:53:40 +0000 (20:53 +0000)
commit22d532ae448dc3ed4f7fa1eb067cd23f0ed4d237
tree3562490f32f31ee5aa01414399d9be8379dfd570
parent42ad161115af2ea1fc2fcd374139e080e8909216
parent1c4dcaec851dcea5972c05378a5e0adfce789285
Merge "Drop incorrect framebuffer texture subtests. am: 625d685874 am: 25b6d76b01 am: 6f6f3d78fc am: 18805bd38c am: ce197d0f27 am: 0e230d6099" into nyc-mr2-dev-plus-aosp
am: 1c4dcaec85

Change-Id: I202b495357f5ae8ede6b5d6aa0cc7fcb73b8cc4f