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

Change-Id: I6f66ea6c3de27d24cfcfb9e802f432653779c6b0


Trivial merge