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

Change-Id: Ie130b6d34ae0dcd24b2fa867d3631cc9428ef4ba


Trivial merge