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

Change-Id: I8d970364b87a9e70785ddb530f0bd2a61408ba63


Trivial merge