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

Change-Id: I0c604c951d025c09b1716e6fcc0817e5be028738


Trivial merge