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

Change-Id: I2838bf32f9d01480763b562920bdc2ba9c6208ba


Trivial merge