Merge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 19:00:43 +0000 (19:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 19:00:43 +0000 (19:00 +0000)
am: 83f1c9448f

Change-Id: I37f4ccac5ba7c6a4294caed138c62e127406137f


Trivial merge