Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." am: ba98ecd5d...
authorKenneth Graunke <kenneth.w.graunke@intel.com>
Tue, 22 Aug 2017 18:16:02 +0000 (18:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:16:02 +0000 (18:16 +0000)
am: 18e68f0078

Change-Id: I248a680b994e500945c2fabd9f69c912397dfeff


Trivial merge