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

Change-Id: Ibf94d90ff3b65eb4b93e8a31e1d86a62ba6d1c70


Trivial merge