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

Change-Id: Idca3c80c0bbb8a761c2d9b1a7e7c8ea0220b4abe


Trivial merge