Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3b...
authorTina Zhou <tinazh@google.com>
Fri, 20 Jan 2017 18:45:40 +0000 (18:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 20 Jan 2017 18:45:40 +0000 (18:45 +0000)
commit4c094d04f0f2f0632d04afdbe8340f0b9a514699
treec7b33ef90963dbaf6484338e3a64e1bf1238925d
parenteb8a9dbfda40f81a7481916842c9fe2357a3eb1b
parent7a0b1861f1b25318c42c2475d450f81ee3fcb83a
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3be2  -s ours am: 7e8c7d9b65 am: dd6ff4b8da
am: 7a0b1861f1

Change-Id: I11b820ce600ad3760eb5e5beac6524baf9903114