Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmal...
authorTina Zhou <tinazh@google.com>
Thu, 17 Nov 2016 17:48:13 +0000 (17:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 17:48:13 +0000 (17:48 +0000)
commit5fa7a52fee21a3d4f48e269126a1862be2b36d1e
tree3d9015f2505ad7e7198c752af0bab9e6ff0e2229
parentd0e437bcd73910253c5758808c88c6d051eb3935
parentac4f7241a1d3b4f95ed17fa41d12ef6899d85929
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmallow-cts-dev am: a5af1b076f am: c2c27aa562 am: e5d1db1d75 am: 5eed9806da
am: ac4f7241a1

Change-Id: I19606c2ea5318702348b73f6be056c85dfc3aaa8