Merge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 19:33:48 +0000 (19:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 19:33:48 +0000 (19:33 +0000)
commit9766b903a5c9e70d1fa26b535d8318e8a23d0732
treef83c4ae88105474ccba79791513065abe1ff2c93
parentcc25372a69ee608ee14b87929c1f6b7e53d487ac
parent1fa60cfb49d636f733cf909b26126286a2eb4116
Merge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3be2 am: b3f5df9d8f am: c51b8d9aed am: ca62006a36 am: fdd8480d61" into nyc-mr2-dev-plus-aosp am: 484a0785b5
am: 1fa60cfb49  -s ours

Change-Id: Idca3c80c0bbb8a761c2d9b1a7e7c8ea0220b4abe