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

Change-Id: I297decc0ca64dd782697ae74cfa7fcf15c178bb9


Trivial merge