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

Change-Id: I57408e9f40640fec25656024aad4a9a047b48e2b


Trivial merge