Merge "Drop incorrect framebuffer texture subtests. am: 625d685874 am: 9df734d698...
authorKenneth Graunke <kenneth.w.graunke@intel.com>
Tue, 22 Aug 2017 19:31:53 +0000 (19:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:31:53 +0000 (19:31 +0000)
am: 957671ab97  -s ours

Change-Id: Ifa13c7e6bd60d54b6cfbea646cdbc5cc037ec8bb


Trivial merge