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

Change-Id: I2f95c748059d7aea5f1899ff6ee6c0fe96ea7245