Merge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am...
authorTina Zhou <tinazh@google.com>
Tue, 22 Aug 2017 20:00:30 +0000 (20:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:00:30 +0000 (20:00 +0000)
commit793663e393b495fc44065b5a7c689737cb29b6d9
treef83c4ae88105474ccba79791513065abe1ff2c93
parentaf301b42f2b4cd38b755d91ac5a5890406864bde
parent64cc77a2d78252ff6d047c60b407b59ef0be6bb0
Merge "Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3be2 am: a580ae91f8 am: 816d6bdb88 am: f49c7ce972 am: a91d8f9bf5 am: 6fd723a7cc" into nyc-mr2-dev-plus-aosp am: 072c251d10
am: 64cc77a2d7  -s ours

Change-Id: I743e8ae6251093948156cce830ed4e9617b1cd82