Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3b...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 20:55:39 +0000 (20:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 20:55:39 +0000 (20:55 +0000)
am: c9e3a51cd3

Change-Id: I23581f8b7ca3e156a43bbd89e46e337c5fb5b869


Trivial merge