Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3b...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 18:36:41 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 18:36:41 +0000 (18:36 +0000)
am: 7e8c7d9b65

Change-Id: Ifdf30f1ba3b3844a7bdcef1f039d17b02704e772


Trivial merge