Merge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 19:00:43 +0000 (19:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 19:00:43 +0000 (19:00 +0000)
commitc944241c91b4ea3736feb5b048900e757ed08382
tree74bdcc363814cf680b5393f994270c2641ea050c
parentbc0c06c44e3df8cbdb97384092ee4decb7ecfe00
parent83f1c9448fe0c24f0df9ce3e6b5aa6ffd9bf0b6c
Merge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3be2 am: b3f5df9d8f am: c51b8d9aed am: ca62006a36 am: db0b4da47e" into nyc-mr2-dev-plus-aosp
am: 83f1c9448f

Change-Id: I37f4ccac5ba7c6a4294caed138c62e127406137f