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

Change-Id: I8ce74f8b664c49c3eff5f37852273dab5e761235


Trivial merge