Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." am: ba98ecd5d...
authorKenneth Graunke <kenneth.w.graunke@intel.com>
Tue, 13 Sep 2016 17:22:11 +0000 (17:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:22:11 +0000 (17:22 +0000)
am: 347b5cdac0

Change-Id: I79e17d8463d191ad27c102f82f4624a0538eafa1


Trivial merge