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

Change-Id: Ifbc5a19b90aad47f9be8192efe75048683a03873


Trivial merge