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 18:19:36 +0000 (18:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:19:36 +0000 (18:19 +0000)
am: 644058875a

Change-Id: I99d4a6650d9efb87299f9988c8896cfce8a96a1c


Trivial merge