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:55:25 +0000 (17:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 17:55:25 +0000 (17:55 +0000)
am: d64c35a5e6

Change-Id: I8bc6c3dd28b4aec45116852fd696934fdc8c48c7


Trivial merge