Merge "Drop incorrect framebuffer texture subtests. am: 625d685874 am: 9df734d698...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 20 Jan 2017 18:49:58 +0000 (18:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 20 Jan 2017 18:49:58 +0000 (18:49 +0000)

Trivial merge