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)
commit1d30a040e616a67f6fde74a119bdb2670f388f6f
treef83c4ae88105474ccba79791513065abe1ff2c93
parent45c5532743bef53acdfe5b28e286e869cba02433
parentc944241c91b4ea3736feb5b048900e757ed08382
Merge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3be2 am: b3f5df9d8f am: c51b8d9aed am: ca62006a36 am: db0b4da47e" into nyc-mr2-dev-plus-aosp am: 83f1c9448f
am: c944241c91  -s ours

Change-Id: I2838bf32f9d01480763b562920bdc2ba9c6208ba