Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3b...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 18:41:44 +0000 (18:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 18:41:44 +0000 (18:41 +0000)
am: 816d6bdb88

Change-Id: Ib3832fe6f652adf148535c38deb52405fe2c996e


Trivial merge