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

Change-Id: I0071922b9376af3a54a88d97c7cbf9d92815ea79


Trivial merge