Merge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:00:30 +0000 (20:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:00:30 +0000 (20:00 +0000)
am: 64cc77a2d7  -s ours

Change-Id: I743e8ae6251093948156cce830ed4e9617b1cd82


Trivial merge