Merge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 18:59:37 +0000 (18:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 18:59:37 +0000 (18:59 +0000)
commit1fa60cfb49d636f733cf909b26126286a2eb4116
tree74bdcc363814cf680b5393f994270c2641ea050c
parentd16cc640c9a9ede0c6df7f33b8a57cdeba9826cd
parent484a0785b5cbf51a5a12d678f9231fb4c82c3455
Merge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3be2 am: b3f5df9d8f am: c51b8d9aed am: ca62006a36 am: fdd8480d61" into nyc-mr2-dev-plus-aosp
am: 484a0785b5

Change-Id: I9292dc710c3129634e1e9aecff422082370116e8