Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3b...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 19:59:51 +0000 (19:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:59:51 +0000 (19:59 +0000)
am: 058c463e80  -s ours

Change-Id: I69952db9d0670c292db610f65102e086604191b1


Trivial merge