Merge "Drop incorrect framebuffer texture subtests. am: 625d685874 am: 25b6d76b01...
authorKenneth Graunke <kenneth.w.graunke@intel.com>
Tue, 22 Aug 2017 19:59:12 +0000 (19:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:59:12 +0000 (19:59 +0000)
am: 22d532ae44  -s ours

Change-Id: I7735a4d1aa1bf8dbe88b5da4dea3c6a12b98c476


Trivial merge