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

Change-Id: Id51b4467e38632dc06a0d0476cb4036e51e0a424


Trivial merge