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)
commit7e8c7d9b65c66f39974b17dc4c149c6566107eb0
treec7b33ef90963dbaf6484338e3a64e1bf1238925d
parent727bdb2369359245a00b1650997e0b6e8fff6f53
parent3baf7e3be270219ae7fb1b9fe3340d2e5bb84d44
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev
am: 3baf7e3be2  -s ours

Change-Id: I57408e9f40640fec25656024aad4a9a047b48e2b