Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3b...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 19:33:23 +0000 (19:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:33:23 +0000 (19:33 +0000)
am: d16cc640c9  -s ours

Change-Id: I7a5f2f65bb2665b05fb24915b62ecb85c3ecc240


Trivial merge