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

Change-Id: Ia80478eb3127eb595158f1a7f0c60e3fa11dc8d0


Trivial merge